chart52: merge with DEV300_m100

63 files changed, 722 insertions, 639 deletions

diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 47a5c1d527e0..bb12f284d53d 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -74,9 +74,9 @@ class SentenceEditWindow_Impl : public MultiLineEdit/*, public SfxListener*/
     using MultiLineEdit::SetText;
 
 private:
-    std::set< USHORT >      m_aIgnoreErrorsAt;
-    USHORT          m_nErrorStart;
-    USHORT          m_nErrorEnd;
+    std::set< sal_uInt16 >      m_aIgnoreErrorsAt;
+    sal_uInt16          m_nErrorStart;
+    sal_uInt16          m_nErrorEnd;
     bool            m_bIsUndoEditMode;
 
     Link            m_aModifyLink;
@@ -93,12 +93,12 @@ public:
 
     void            SetModifyHdl(const Link& rLink) { m_aModifyLink = rLink;}
 
-    void            SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd );
+    void            SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd );
     void            SetText( const String& rStr );
 
     bool            MarkNextError( bool bIgnoreCurrentError );
     void            ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage);
-    void            MoveErrorMarkTo(USHORT nErrorStart, USHORT nErrorEnd, bool bGrammar);
+    void            MoveErrorMarkTo(sal_uInt16 nErrorStart, sal_uInt16 nErrorEnd, bool bGrammar);
     String          GetErrorText() const;
     void            RestoreCurrentError();
 
@@ -108,8 +108,8 @@ public:
     const SpellErrorDescription* GetAlternatives();
 
 
-    void            ResetModified()   { GetTextEngine()->SetModified(FALSE); m_bIsUndoEditMode = false;}
-    BOOL            IsModified() const              { return GetTextEngine()->IsModified(); }
+    void            ResetModified()   { GetTextEngine()->SetModified(sal_False); m_bIsUndoEditMode = false;}
+    sal_Bool            IsModified() const              { return GetTextEngine()->IsModified(); }
 
     bool            IsUndoEditMode() const { return m_bIsUndoEditMode;}
     void            SetUndoEditMode(bool bSet);
@@ -118,9 +118,9 @@ public:
 
     void            ResetUndo();
     void            Undo();
-    void            AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE );
-    USHORT          GetUndoActionCount();
-    void            UndoActionStart( USHORT nId );
+    void            AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False );
+    sal_uInt16      GetUndoActionCount();
+    void            UndoActionStart( sal_uInt16 nId );
     void            UndoActionEnd();
 
     void            MoveErrorEnd(long nOffset);
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
new file mode 100644
index 000000000000..abf154c81ac5
--- /dev/null
+++ b/cui/source/inc/about.hxx
@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _ABOUT_HXX
+#define _ABOUT_HXX
+
+// include ---------------------------------------------------------------
+
+#include <tools/resary.hxx>
+#include <vcl/button.hxx>
+#include <vcl/accel.hxx>
+#include <svtools/svmedit.hxx>
+#include <tools/list.hxx>
+#include <svtools/stdctrl.hxx>
+#include <sfx2/basedlgs.hxx>        // SfxModalDialog
+
+DECLARE_LIST( AccelList, Accelerator* )
+
+// class AboutDialog -----------------------------------------------------
+
+class AboutDialog : public SfxModalDialog
+{
+private:
+    OKButton        aOKButton;
+    Image           aAppLogo;
+
+    FixedInfo       aVersionText;
+    MultiLineEdit   aCopyrightText;
+    FixedInfo       aBuildData;
+
+    ResStringArray* pDeveloperAry;
+    String          aDevVersionStr;
+    String          aAccelStr;
+    String          aVersionData;
+    String          aCopyrightTextStr;
+
+    AccelList       aAccelList;
+
+    AutoTimer       aTimer;
+    long            nOff;
+    long            m_nDeltaWidth;
+    int             m_nPendingScrolls;
+
+    sal_Bool            bNormal;
+
+protected:
+    virtual sal_Bool    Close();
+    virtual void    Paint( const Rectangle& );
+
+public:
+    AboutDialog( Window* pParent, const ResId& nId );
+    ~AboutDialog();
+
+    DECL_LINK( TimerHdl, Timer * );
+    DECL_LINK( AccelSelectHdl, Accelerator * );
+};
+
+#endif // #ifndef _ABOUT_HXX
+
+
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index aa8224654c65..f44a60cc8040 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -90,7 +90,7 @@ public:
                                     m_pAccelConfigPage( pAccelConfigPage )
                                 {}
 
-    void                        ReplaceEntry( USHORT nPos, const String &rStr );
+    void                        ReplaceEntry( sal_uInt16 nPos, const String &rStr );
 };
 
 // class SfxAcceleratorConfigPage ----------------------------------------
@@ -107,7 +107,7 @@ struct TAccInfo
             , m_bIsConfigurable(sal_True )
             , m_sCommand       (         )
             , m_aKey           (aKey     )
-            // its important to set TRUE as default -
+            // its important to set sal_True as default -
             // because only fix entries will be disabled later ...
         {}
 
@@ -184,7 +184,7 @@ private:
 
     String                      GetLabel4Command(const String& sCommand);
     void                        InitAccCfg();
-    USHORT                      MapKeyCodeToPos( const KeyCode &rCode ) const;
+    sal_uInt16                      MapKeyCodeToPos( const KeyCode &rCode ) const;
     css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName);
     void                        StartFileDialog( WinBits nBits, const String& rTitle );
 
@@ -197,7 +197,7 @@ public:
                                 SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet );
     virtual                     ~SfxAcceleratorConfigPage();
 
-    virtual BOOL                FillItemSet( SfxItemSet& );
+    virtual sal_Bool                FillItemSet( SfxItemSet& );
     virtual void                Reset( const SfxItemSet& );
 
     void                        Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
@@ -214,8 +214,8 @@ public:
     SfxAcceleratorConfigListBox( Window *pParent, ResId &rResId ) :
         ListBox( pParent, rResId ) {}
 
-    void ReplaceEntry( USHORT nPos, const String &rStr );
-    void ExpandEntry ( USHORT nPos, const String &rStr );
+    void ReplaceEntry( sal_uInt16 nPos, const String &rStr );
+    void ExpandEntry ( sal_uInt16 nPos, const String &rStr );
 };
 
 class SvxShortcutAssignDlg : public SfxSingleTabDialog
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index aea3e5a16ffb..34fada956c86 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -52,7 +52,7 @@ public:
     virtual             ~AlignmentTabPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
     virtual void        Reset( const SfxItemSet& rSet );
     virtual int         DeactivatePage( SfxItemSet* pSet );
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index c2ba66766292..7fe4483e5256 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -53,7 +53,7 @@ public:
 
     OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet );
 
-    void    EnableLanguage(BOOL bEnable)
+    void    EnableLanguage(sal_Bool bEnable)
             {   aLanguageFT.Enable(bEnable);
                 aLanguageLB.Enable(bEnable);}
 
@@ -87,14 +87,14 @@ class OfaACorrCheckListBox : public SvxSimpleTable
         OfaACorrCheckListBox(Window* pParent, const ResId& rResId ) :
             SvxSimpleTable( pParent, rResId ){}
 
-        inline void *GetUserData(ULONG nPos) { return GetEntry(nPos)->GetUserData(); }
-        inline void SetUserData(ULONG nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
-        inline ULONG GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); }
+        inline void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); }
+        inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
+        inline sal_uLong GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); }
 
-        BOOL            IsChecked(ULONG nPos, USHORT nCol = 0);
-        void            CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked);
-        SvButtonState   GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const;
-        void            SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState );
+        sal_Bool            IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0);
+        void            CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked);
+        SvButtonState   GetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol ) const;
+        void            SetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol, SvButtonState );
 };
 
 // class OfaAutocorrOptionsPage ------------------------------------------
@@ -124,7 +124,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& );
 
@@ -171,13 +171,13 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
 
     Font            aBulletFont;
     Font            aByInputBulletFont;
-    USHORT          nPercent;
+    sal_uInt16          nPercent;
 
     SvLBoxButtonData*   pCheckButtonData;
 
         DECL_LINK(SelectHdl, OfaACorrCheckListBox*);
         DECL_LINK(EditHdl, PushButton*);
-        SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol);
+        SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
 
 
         OfaSwAutoFmtOptionsPage( Window* pParent,
@@ -187,7 +187,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
     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& );
 };
@@ -197,16 +197,16 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
 class AutoCorrEdit : public Edit
 {
     Link    aActionLink;
-    BOOL    bSpaces;
+    sal_Bool    bSpaces;
 
     public:
                     AutoCorrEdit(Window* pParent, const ResId& rResId) :
-                        Edit(pParent, rResId), bSpaces(FALSE){}
+                        Edit(pParent, rResId), bSpaces(sal_False){}
 
     void            SetActionHdl( const Link& rLink )
                                 { aActionLink = rLink;}
 
-    void            SetSpaces(BOOL bSet)
+    void            SetSpaces(sal_Bool bSet)
                                 {bSpaces = bSet;}
 
     virtual void    KeyInput( const KeyEvent& rKEvent );
@@ -243,16 +243,16 @@ private:
         CharClass*              pCharClass;
         LanguageType            eLang;
 
-        BOOL            bHasSelectionText;
-        BOOL            bFirstSelect:1;
-        BOOL            bReplaceEditChanged:1;
-        BOOL            bSWriter:1;
+        sal_Bool            bHasSelectionText;
+        sal_Bool            bFirstSelect:1;
+        sal_Bool            bReplaceEditChanged:1;
+        sal_Bool            bSWriter:1;
 
         DECL_LINK(SelectHdl, SvTabListBox*);
         DECL_LINK(NewDelHdl, PushButton*);
         DECL_LINK(ModifyHdl, Edit*);
 
-        void            RefillReplaceBox(BOOL bFromReset, //Box mit neuer Sprache fuellen
+        void            RefillReplaceBox(sal_Bool bFromReset, //Box mit neuer Sprache fuellen
                                         LanguageType eOldLanguage,
                                         LanguageType eNewLanguage);
 
@@ -263,7 +263,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& );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
@@ -305,7 +305,7 @@ private:
     DECL_LINK(SelectHdl, ListBox*);
     DECL_LINK(ModifyHdl, Edit*);
 
-    void            RefillReplaceBoxes(BOOL bFromReset, //Box mit neuer Sprache fuellen
+    void            RefillReplaceBoxes(sal_Bool bFromReset, //Box mit neuer Sprache fuellen
                                         LanguageType eOldLanguage,
                                         LanguageType eNewLanguage);
 public:
@@ -315,7 +315,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& );
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
@@ -380,7 +380,7 @@ private:
 
     String              ChangeStringExt_Impl( sal_UCS4 );
 
-    SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol);
+    SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
 
                         OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet );
 public:
@@ -389,7 +389,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& );
 };
@@ -428,7 +428,7 @@ class OfaAutoCompleteTabPage : public SfxTabPage
     AutoCompleteMultiListBox    aLBEntries;
     PushButton                  aPBEntries;
     SvStringsISortDtor*         pAutoCmpltList;
-    USHORT                      nAutoCmpltListCnt;
+    sal_uInt16                      nAutoCmpltListCnt;
 
     DECL_LINK( CheckHdl, CheckBox* );
 
@@ -440,7 +440,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& );
 
@@ -507,7 +507,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& );
 };
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 78e545e5e51a..01172af4a435 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -65,17 +65,17 @@ class SvxBackgroundTabPage : public SvxTabPage
     using TabPage::DeactivatePage;
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        FillUserData();
     virtual void        PointChanged( Window* pWindow, RECT_POINT eRP );
 
     void                ShowSelector(); // Umschalt-ListBox aktivieren
     void                ShowTblControl(); // fuer den Writer (Zellen/Zeilen/Tabelle)
-    void                ShowParaControl(BOOL bCharOnly = FALSE); // fuer den Writer (Absatz/Zeichen)
-    void                EnableTransparency(BOOL bColor, BOOL bGraphic);
+    void                ShowParaControl(sal_Bool bCharOnly = sal_False); // fuer den Writer (Absatz/Zeichen)
+    void                EnableTransparency(sal_Bool bColor, sal_Bool bGraphic);
     virtual void        PageCreated (SfxAllItemSet aSet); //add CHINA001
 protected:
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
@@ -122,13 +122,13 @@ private:
 
     //------------------------------------------------------
     Color       aBgdColor;
-    USHORT      nHtmlMode;
-    BOOL        bAllowShowSelector  : 1;
-    BOOL        bIsGraphicValid     : 1;
-    BOOL        bLinkOnly           : 1;
-    BOOL        bResized            : 1;
-    BOOL        bColTransparency    : 1;
-    BOOL        bGraphTransparency  : 1;
+    sal_uInt16      nHtmlMode;
+    sal_Bool        bAllowShowSelector  : 1;
+    sal_Bool        bIsGraphicValid     : 1;
+    sal_Bool        bLinkOnly           : 1;
+    sal_Bool        bResized            : 1;
+    sal_Bool        bColTransparency    : 1;
+    sal_Bool        bGraphTransparency  : 1;
     Graphic     aBgdGraphic;
     String      aBgdGraphicPath;
     String      aBgdGraphicFilter;
@@ -145,13 +145,13 @@ private:
     void                FillColorValueSets_Impl();
     void                ShowColorUI_Impl();
     void                ShowBitmapUI_Impl();
-    BOOL                LoadLinkedGraphic_Impl();
+    sal_Bool                LoadLinkedGraphic_Impl();
     void                RaiseLoadError_Impl();
     void                SetGraphicPosition_Impl( SvxGraphicPosition ePos );
     SvxGraphicPosition  GetGraphicPosition_Impl();
     void                FillControls_Impl(const SvxBrushItem& rBgdAttr,
                                             const String& rUserData);
-    BOOL                FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, USHORT nSlot);
+    sal_Bool                FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot);
     void                ResetFromWallpaperItem( const SfxItemSet& rSet );
 
     DECL_LINK( LoadTimerHdl_Impl, Timer* );
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index 249c9c427485..575e744d8ddf 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -40,15 +40,15 @@ class SvxBorderBackgroundDlg: public SfxTabDialog
 public:
     SvxBorderBackgroundDlg( Window *pParent,
                             const SfxItemSet& rCoreSet,
-                            BOOL bEnableSelector = FALSE );
+                            sal_Bool bEnableSelector = sal_False );
 
     ~SvxBorderBackgroundDlg();
 
 protected:
-    virtual void    PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
+    virtual void    PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage );
 
 private:
-    BOOL    bEnableBackgroundSelector; // fuer Border/Background-Dlg
+    sal_Bool    bEnableBackgroundSelector; // fuer Border/Background-Dlg
 };
 
 
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 33ea94ff4478..d62083b37d77 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -52,9 +52,9 @@ class SvxBorderTabPage : public SfxTabPage
 public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rCoreAttrs );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rCoreAttrs );
     virtual void        Reset( const SfxItemSet& );
 
     void                HideShadowControls();
@@ -122,7 +122,7 @@ private:
     bool                mbBLTREnabled;      /// true = Bottom-left to top-right border enabled.
     bool                mbUseMarginItem;
 
-    static BOOL         bSync;
+    static sal_Bool         bSync;
 
 #ifdef _SVX_BORDER_CXX
     // Handler
@@ -134,8 +134,8 @@ private:
     DECL_LINK( ModifyDistanceHdl_Impl, MetricField*);
     DECL_LINK( SyncHdl_Impl, CheckBox*);
 
-    USHORT              GetPresetImageId( USHORT nValueSetIdx ) const;
-    USHORT              GetPresetStringId( USHORT nValueSetIdx ) const;
+    sal_uInt16              GetPresetImageId( sal_uInt16 nValueSetIdx ) const;
+    sal_uInt16              GetPresetStringId( sal_uInt16 nValueSetIdx ) const;
 
     void                FillPresetVS();
     void                FillShadowVS();
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 8d63c5f8dd49..13c1289bda48 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -75,7 +75,7 @@ public:
     SvxConfigDialog( Window*, const SfxItemSet* );
     ~SvxConfigDialog();
 
-    virtual void                PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void                PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
     virtual short               Ok();
 
     void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
@@ -121,7 +121,7 @@ public:
         const com::sun::star::uno::Reference
             < com::sun::star::uno::XInterface >& xManager );
 
-    void SetModified( bool bValue = TRUE ) { bModified = bValue; }
+    void SetModified( bool bValue = sal_True ) { bModified = bValue; }
     bool IsModified( ) { return bModified; }
 
     bool IsReadOnly( ) { return bReadOnly; }
@@ -220,7 +220,7 @@ public:
     // methods inherited from SaveInData
     SvxEntries*         GetEntries();
     void                SetEntries( SvxEntries* );
-    bool                HasURL( const rtl::OUString& URL ) { (void)URL; return FALSE; }
+    bool                HasURL( const rtl::OUString& URL ) { (void)URL; return sal_False; }
     bool                HasSettings() { return m_xMenuSettings.is(); }
     void                Reset();
     bool                Apply();
@@ -231,7 +231,7 @@ class SvxConfigEntry
 private:
 
     // common properties
-    USHORT                      nId;
+    sal_uInt16                      nId;
     ::rtl::OUString             aHelpText;
     ::rtl::OUString             aLabel;
     ::rtl::OUString             aCommand;
@@ -258,18 +258,18 @@ public:
 
     SvxConfigEntry( const ::rtl::OUString& rDisplayName,
                     const ::rtl::OUString& rCommandURL,
-                    bool bPopup = FALSE,
-                    bool bParentData = FALSE );
+                    bool bPopup = sal_False,
+                    bool bParentData = sal_False );
 
     SvxConfigEntry()
         :
             nId( 0 ),
-            bPopUp( FALSE ),
-            bStrEdited( FALSE ),
-            bIsUserDefined( FALSE ),
-            bIsMain( FALSE ),
-            bIsParentData( FALSE ),
-            bIsVisible( TRUE ),
+            bPopUp( sal_False ),
+            bStrEdited( sal_False ),
+            bIsUserDefined( sal_False ),
+            bIsMain( sal_False ),
+            bIsParentData( sal_False ),
+            bIsVisible( sal_True ),
             nStyle( 0 ),
             pEntries( 0 )
     {}
@@ -280,7 +280,7 @@ public:
     void    SetCommand( const String& rCmd ) { aCommand = rCmd; }
 
     const ::rtl::OUString&      GetName() const { return aLabel; }
-    void    SetName( const String& rStr ) { aLabel = rStr; bStrEdited = TRUE; }
+    void    SetName( const String& rStr ) { aLabel = rStr; bStrEdited = sal_True; }
     bool    HasChangedName() const { return bStrEdited; }
 
     const ::rtl::OUString&      GetHelpText() ;
@@ -289,10 +289,10 @@ public:
     const ::rtl::OUString&      GetHelpURL() const { return aHelpURL; }
     void    SetHelpURL( const String& rStr ) { aHelpURL = rStr; }
 
-    void    SetPopup( bool bOn = TRUE ) { bPopUp = bOn; }
+    void    SetPopup( bool bOn = sal_True ) { bPopUp = bOn; }
     bool    IsPopup() const { return bPopUp; }
 
-    void    SetUserDefined( bool bOn = TRUE ) { bIsUserDefined = bOn; }
+    void    SetUserDefined( bool bOn = sal_True ) { bIsUserDefined = bOn; }
     bool    IsUserDefined() const { return bIsUserDefined; }
 
     bool    IsBinding() const { return !bPopUp; }
@@ -302,10 +302,10 @@ public:
     void    SetEntries( SvxEntries* entries ) { pEntries = entries; }
     bool    HasEntries() const { return pEntries != NULL; }
 
-    void    SetMain( bool bValue = TRUE ) { bIsMain = bValue; }
+    void    SetMain( bool bValue = sal_True ) { bIsMain = bValue; }
     bool    IsMain() { return bIsMain; }
 
-    void    SetParentData( bool bValue = TRUE ) { bIsParentData = bValue; }
+    void    SetParentData( bool bValue = sal_True ) { bIsParentData = bValue; }
     bool    IsParentData() { return bIsParentData; }
 
     bool    IsMovable();
@@ -345,13 +345,13 @@ public:
 
     virtual sal_Int8    AcceptDrop( const AcceptDropEvent& rEvt );
 
-    virtual BOOL        NotifyAcceptDrop( SvLBoxEntry* pEntry );
+    virtual sal_Bool        NotifyAcceptDrop( SvLBoxEntry* pEntry );
 
-    virtual BOOL        NotifyMoving( SvLBoxEntry*, SvLBoxEntry*,
-                                      SvLBoxEntry*&, ULONG& );
+    virtual sal_Bool        NotifyMoving( SvLBoxEntry*, SvLBoxEntry*,
+                                      SvLBoxEntry*&, sal_uLong& );
 
-    virtual BOOL        NotifyCopying( SvLBoxEntry*, SvLBoxEntry*,
-                                       SvLBoxEntry*&, ULONG&);
+    virtual sal_Bool        NotifyCopying( SvLBoxEntry*, SvLBoxEntry*,
+                                       SvLBoxEntry*&, sal_uLong&);
 
     virtual DragDropMode    NotifyStartDrag(
         TransferDataContainer&, SvLBoxEntry* );
@@ -444,13 +444,13 @@ protected:
 
     SvLBoxEntry*    InsertEntry(        SvxConfigEntry* pNewEntryData,
                                         SvLBoxEntry* pTarget = NULL,
-                                        bool bFront = FALSE );
+                                        bool bFront = sal_False );
 
     void            AddSubMenusToUI(    const String& rBaseTitle,
                                         SvxConfigEntry* pParentData );
 
     SvLBoxEntry*    InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData,
-                                        ULONG nPos = LIST_APPEND );
+                                        sal_uLong nPos = LIST_APPEND );
 
     SvxEntries*     FindParentForChild( SvxEntries* pParentEntries,
                                         SvxConfigEntry* pChildData );
@@ -464,15 +464,15 @@ public:
     SaveInData*     GetSaveInData() { return pCurrentSaveInData; }
 
     SvLBoxEntry*    AddFunction( SvLBoxEntry* pTarget = NULL,
-                                 bool bFront = FALSE,
-                                 bool bAllowDuplicates = FALSE );
+                                 bool bFront = sal_False,
+                                 bool bAllowDuplicates = sal_False );
 
     virtual void    MoveEntry( bool bMoveUp );
 
     bool            MoveEntryData(  SvLBoxEntry* pSourceEntry,
                                     SvLBoxEntry* pTargetEntry );
 
-    BOOL            FillItemSet( SfxItemSet& );
+    sal_Bool            FillItemSet( SfxItemSet& );
     void            Reset( const SfxItemSet& );
 
     virtual bool    DeleteSelectedContent() = 0;
@@ -554,7 +554,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog
 public:
     SvxMainMenuOrganizerDialog (
         Window*, SvxEntries*,
-        SvxConfigEntry*, bool bCreateMenu = FALSE );
+        SvxConfigEntry*, bool bCreateMenu = sal_False );
 
     ~SvxMainMenuOrganizerDialog ();
 
@@ -568,7 +568,7 @@ class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox
     Size            m_aCheckBoxImageSizePixel;
     Link            m_aChangedListener;
     SvLBoxButtonData*   m_pButtonData;
-    BOOL            m_bHiContrastMode;
+    sal_Bool            m_bHiContrastMode;
     SvxConfigPage*  pPage;
 
     void            ChangeVisibility( SvLBoxEntry* pEntry );
@@ -596,11 +596,11 @@ public:
     Size            GetCheckBoxPixelSize() const
         { return m_aCheckBoxImageSizePixel; }
 
-    virtual BOOL    NotifyMoving(
-        SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG& );
+    virtual sal_Bool    NotifyMoving(
+        SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, sal_uLong& );
 
-    virtual BOOL    NotifyCopying(
-        SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG&);
+    virtual sal_Bool    NotifyCopying(
+        SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, sal_uLong&);
 
     void            KeyInput( const KeyEvent& rKeyEvent );
 };
@@ -629,8 +629,8 @@ public:
     ~SvxToolbarConfigPage();
 
     SvLBoxEntry*    AddFunction( SvLBoxEntry* pTarget = NULL,
-                                             bool bFront = FALSE,
-                                             bool bAllowDuplicates = TRUE );
+                                             bool bFront = sal_False,
+                                             bool bAllowDuplicates = sal_True );
 
     void            MoveEntry( bool bMoveUp );
 
@@ -803,7 +803,7 @@ public:
         const rtl::OUString& aMessage );
 
     rtl::OUString ReplaceIconName( const rtl::OUString& );
-    USHORT ShowDialog();
+    sal_uInt16 ShowDialog();
 };
 //added for issue83555
 class SvxIconChangeDialog : public ModalDialog
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 66238e7ac7f3..8f80928c33ed 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -102,15 +102,15 @@ struct SfxStylesInfo_Impl
 
 struct SfxGroupInfo_Impl
 {
-    USHORT      nKind;
-    USHORT      nUniqueID;
+    sal_uInt16  nKind;
+    sal_uInt16  nUniqueID;
     void*       pObject;
-    BOOL        bWasOpened;
+    sal_Bool        bWasOpened;
     String      sCommand;
     String      sLabel;
 
-                SfxGroupInfo_Impl( USHORT n, USHORT nr, void* pObj = 0 ) :
-                    nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(FALSE) {}
+                SfxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, void* pObj = 0 ) :
+                    nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(sal_False) {}
 };
 
 struct CuiMacroInfo
@@ -152,7 +152,7 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
     //SfxSlotPool*                    pSlotPool;
     SfxConfigFunctionListBox_Impl*  pFunctionListBox;
     SfxGroupInfoArr_Impl            aArr;
-    ULONG                           nMode;
+    sal_uLong                       nMode;
 
     ::rtl::OUString m_sModuleLongName;
     css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
@@ -176,12 +176,12 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
 protected:
     virtual void        RequestingChilds( SvLBoxEntry *pEntry);
     using SvListView::Expand;
-    virtual BOOL        Expand( SvLBoxEntry* pParent );
+    virtual sal_Bool        Expand( SvLBoxEntry* pParent );
 
 public:
     SfxConfigGroupListBox_Impl ( Window* pParent,
                                  const ResId&,
-                                 ULONG nConfigMode = 0 );
+                                 sal_uLong nConfigMode = 0 );
     ~SfxConfigGroupListBox_Impl();
     void                ClearAll();
 
@@ -190,7 +190,7 @@ public:
                              const ::rtl::OUString&                                        sModuleLongName);
     void                SetFunctionListBox( SfxConfigFunctionListBox_Impl *pBox )
                         { pFunctionListBox = pBox; }
-    void                Open( SvLBoxEntry*, BOOL );
+    void                Open( SvLBoxEntry*, sal_Bool );
     void                GroupSelected();
     void                SelectMacro( const SfxMacroInfoItem* );
     void                SelectMacro( const String&, const String& );
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 315a78e70a03..29fcdb13b63a 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -43,13 +43,13 @@ class FontList;
 
 // -----------------------------------------------------------------------
 
-#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)
 
 // class SvxCharBasePage -------------------------------------------------
 
@@ -59,18 +59,18 @@ protected:
     SvxFontPrevWindow   m_aPreviewWin;
     FixedInfo           m_aFontTypeFT;
 
-    BOOL                m_bPreviewBackgroundToCharacter;
+    sal_Bool                m_bPreviewBackgroundToCharacter;
 
                         SvxCharBasePage( Window* pParent, const ResId& rResIdTabPage, const SfxItemSet&,
-                                            USHORT nResIdPrewievWin, USHORT nResIdFontTypeFT );
+                                            sal_uInt16 nResIdPrewievWin, sal_uInt16 nResIdFontTypeFT );
     virtual             ~SvxCharBasePage();
 
-    void                SetPrevFontSize( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont );
-    void                SetPrevFont( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont );
-    void                SetPrevFontStyle( const SfxItemSet& rSet, USHORT nSlotPosture, USHORT nSlotWeight, SvxFont& rFont ); // posture/weight
+    void                SetPrevFontSize( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont );
+    void                SetPrevFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont );
+    void                SetPrevFontStyle( const SfxItemSet& rSet, sal_uInt16 nSlotPosture, sal_uInt16 nSlotWeight, SvxFont& rFont ); // posture/weight
     void                SetPrevFontWidthScale( const SfxItemSet& rSet );
 
-    void                SetPrevFontEscapement( BYTE nProp, BYTE nEscProp, short nEsc );
+    void                SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
 
     inline SvxFont&     GetPreviewFont();
     inline SvxFont&     GetPreviewCJKFont();
@@ -153,7 +153,7 @@ private:
     };
 
     void                Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp );
-    BOOL                FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
+    sal_Bool                FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
     void                ResetColor_Impl( const SfxItemSet& rSet );
 
     DECL_LINK(          UpdateHdl_Impl, Timer* );
@@ -171,10 +171,10 @@ public:
                         ~SvxCharNamePage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
     virtual void        Reset( const SfxItemSet& rSet );
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
 
     void                SetFontList( const SvxFontListItem& rItem );
     void                EnableRelativeMode();
@@ -182,7 +182,7 @@ public:
     //                  the writer uses SID_ATTR_BRUSH as font background
     void                SetPreviewBackgroundToCharacter();
 
-    void                DisableControls( USHORT nDisable );
+    void                DisableControls( sal_uInt16 nDisable );
     virtual void        PageCreated (SfxAllItemSet aSet);
 };
 
@@ -233,7 +233,7 @@ private:
     FixedText           m_aPositionFT;
     ListBox             m_aPositionLB;
 
-    USHORT              m_nHtmlMode;
+    sal_uInt16              m_nHtmlMode;
 
     String              m_aTransparentColorName;
 
@@ -243,7 +243,7 @@ private:
     void                UpdatePreview_Impl();
     void                SetCaseMap_Impl( SvxCaseMap eCaseMap );
     void                ResetColor_Impl( const SfxItemSet& rSet );
-    BOOL                FillItemSetColor_Impl( SfxItemSet& rSet );
+    sal_Bool                FillItemSetColor_Impl( SfxItemSet& rSet );
 
     DECL_LINK(          SelectHdl_Impl, ListBox* );
     DECL_LINK(          CbClickHdl_Impl, CheckBox* );
@@ -260,12 +260,12 @@ public:
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
     virtual void        Reset( const SfxItemSet& rSet );
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
 
-    void                DisableControls( USHORT nDisable );
+    void                DisableControls( sal_uInt16 nDisable );
     void                EnableFlash();
     //                  the writer uses SID_ATTR_BRUSH as font background
     void                SetPreviewBackgroundToCharacter();
@@ -305,17 +305,17 @@ private:
     short               m_nSuperEsc;
     short               m_nSubEsc;
 
-    UINT16              m_nScaleWidthItemSetVal;
-    UINT16              m_nScaleWidthInitialVal;
+    sal_uInt16              m_nScaleWidthItemSetVal;
+    sal_uInt16              m_nScaleWidthInitialVal;
 
-    BYTE                m_nSuperProp;
-    BYTE                m_nSubProp;
+    sal_uInt8                m_nSuperProp;
+    sal_uInt8                m_nSubProp;
 
                         SvxCharPositionPage( Window* pParent, const SfxItemSet& rSet );
 
     void                Initialize();
-    void                UpdatePreview_Impl( BYTE nProp, BYTE nEscProp, short nEsc );
-    void                SetEscapement_Impl( USHORT nEsc );
+    void                UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
+    void                SetEscapement_Impl( sal_uInt16 nEsc );
 
     DECL_LINK(          PositionHdl_Impl, RadioButton* );
     DECL_LINK(          RotationHdl_Impl, RadioButton* );
@@ -337,10 +337,10 @@ public:
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
     virtual void        Reset( const SfxItemSet& rSet );
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        FillUserData();
     //                  the writer uses SID_ATTR_BRUSH as font background
     void                SetPreviewBackgroundToCharacter();
@@ -361,15 +361,15 @@ private:
     FixedText           m_aEndBracketFT;
     ListBox             m_aEndBracketLB;
 
-    USHORT              m_nStartBracketPosition;
-    USHORT              m_nEndBracketPosition;
+    sal_uInt16              m_nStartBracketPosition;
+    sal_uInt16              m_nEndBracketPosition;
 
                         SvxCharTwoLinesPage( Window* pParent, const SfxItemSet& rSet );
 
     void                UpdatePreview_Impl();
     void                Initialize();
     void                SelectCharacter( ListBox* pBox );
-    void                SetBracket( sal_Unicode cBracket, BOOL bStart );
+    void                SetBracket( sal_Unicode cBracket, sal_Bool bStart );
 
     DECL_LINK(          TwoLinesHdl_Impl, CheckBox* );
     DECL_LINK(          CharacterMapHdl_Impl, ListBox* );
@@ -383,10 +383,10 @@ public:
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
     virtual void        Reset( const SfxItemSet& rSet );
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     //                  the writer uses SID_ATTR_BRUSH as font background
     void                SetPreviewBackgroundToCharacter();
     virtual void        PageCreated (SfxAllItemSet aSet);
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 88e30ac7dd7a..75f6a11d2e52 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -88,9 +88,9 @@ public:
     ~SvxConnectionPage();
 
     static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  sal_uInt16*     GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet & );
 
     void         Construct();
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 805f90313e29..eb9a9c91c0eb 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -60,7 +60,7 @@ class SvxShowText : public Control
 public:
                     SvxShowText( Window* pParent,
                                  const ResId& rResId,
-                                 BOOL bCenter = FALSE );
+                                 sal_Bool bCenter = sal_False );
                     ~SvxShowText();
 
     void            SetFont( const Font& rFont );
@@ -71,14 +71,14 @@ protected:
 
 private:
     long            mnY;
-    BOOL            mbCenter;
+    sal_Bool            mbCenter;
 
 };
 
 class SvxCharMapData
 {
 public:
-                    SvxCharMapData( class SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pResContext );
+                    SvxCharMapData( class SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* pResContext );
 
     void            SetCharFont( const Font& rFont );
 
@@ -103,7 +103,7 @@ friend class SvxCharacterMap;
     FixedText       aCharCodeText;
 //  FixedText       aAssignText;
     Font            aFont;
-    BOOL            bOne;
+    sal_Bool            bOne;
     const SubsetMap* pSubsetMap;
 
     DECL_LINK( OKHdl, OKButton* );
@@ -123,7 +123,7 @@ private:
     SvxCharMapData* mpCharMapData;
 
 public:
-                    SvxCharacterMap( Window* pParent, BOOL bOne=TRUE, const SfxItemSet* pSet=0 );
+                    SvxCharacterMap( Window* pParent, sal_Bool bOne=sal_True, const SfxItemSet* pSet=0 );
                     ~SvxCharacterMap();
 
     void            DisableFontSelection();
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 954866383c4b..459e927eff3e 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -82,7 +82,7 @@ private:
 
     void                        ImplSearch( const INetURLObject& rStartURL,
                                             const ::std::vector< String >& rFormats,
-                                            BOOL bRecursive );
+                                            sal_Bool bRecursive );
 
     virtual void SAL_CALL       run();
     virtual void SAL_CALL       onTerminated();
@@ -243,7 +243,7 @@ public:
                     GalleryIdDialog( Window* pParent, GalleryTheme* pThm );
                     ~GalleryIdDialog() {}
 
-    ULONG           GetId() const { return aLbResName.GetSelectEntryPos(); }
+    sal_uLong           GetId() const { return aLbResName.GetSelectEntryPos(); }
 };
 
 // --------------------------
@@ -254,7 +254,7 @@ class GalleryThemeProperties : public SfxTabDialog
 {
     ExchangeData*   pData;
 
-    virtual void    PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void    PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 public:
 
@@ -285,7 +285,7 @@ private:
     ExchangeData*       pData;
 
     virtual void        Reset( const SfxItemSet& ) {}
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
 
 
 public:
@@ -325,19 +325,19 @@ class TPGalleryThemeProperties : public SfxTabPage
     String              aLastFilterName;
     String              aPreviewString;
     INetURLObject       aURL;
-    USHORT              nCurFilterPos;
-    USHORT              nFirstExtFilterPos;
-    BOOL                bEntriesFound;
-    BOOL                bInputAllowed;
-    BOOL                bTakeAll;
-    BOOL                bSearchRecursive;
+    sal_uInt16              nCurFilterPos;
+    sal_uInt16              nFirstExtFilterPos;
+    sal_Bool                bEntriesFound;
+    sal_Bool                bInputAllowed;
+    sal_Bool                bTakeAll;
+    sal_Bool                bSearchRecursive;
 
     ::com::sun::star::uno::Reference< ::svt::DialogClosedListener >                  xDialogListener;
     ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer >             xMediaPlayer;
     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker > xFolderPicker;
 
     virtual void        Reset( const SfxItemSet& /*rSet*/ ) {}
-    virtual BOOL        FillItemSet( SfxItemSet& /*rSet*/ ) { return TRUE; }
+    virtual sal_Bool        FillItemSet( SfxItemSet& /*rSet*/ ) { return sal_True; }
     ::rtl::OUString     addExtension( const ::rtl::OUString&, const ::rtl::OUString& );
     void                FillFilterList();
 
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index e7f9047af5ca..455ebd021f4c 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -61,7 +61,7 @@ class SvxGraphicFilter
 {
 public:
 
-    static ULONG    ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
+    static sal_uLong    ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
     static void     DisableGraphicFilterSlots( SfxItemSet& rSet );
 };
 */
@@ -136,13 +136,13 @@ private:
 public:
 
                     GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
-                                         USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges );
+                                         sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges );
                     ~GraphicFilterMosaic();
 
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
     long            GetTileWidth() const { return static_cast<long>(maMtrWidth.GetValue()); }
     long            GetTileHeight() const { return static_cast<long>(maMtrHeight.GetValue()); }
-    BOOL            IsEnhanceEdges() const { return maCbxEdges.IsChecked(); }
+    sal_Bool            IsEnhanceEdges() const { return maCbxEdges.IsChecked(); }
 };
 
 // -------------------------
@@ -160,12 +160,12 @@ private:
 public:
 
                     GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
-                                           BYTE nGreyThreshold, BOOL bInvert );
+                                           sal_uInt8 nGreyThreshold, sal_Bool bInvert );
                     ~GraphicFilterSolarize();
 
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
-    BYTE            GetGreyThreshold() const { return( (BYTE) FRound( maMtrThreshold.GetValue() * 2.55 ) ); }
-    BOOL            IsInvert() const { return maCbxInvert.IsChecked(); }
+    sal_uInt8           GetGreyThreshold() const { return( (sal_uInt8) FRound( maMtrThreshold.GetValue() * 2.55 ) ); }
+    sal_Bool            IsInvert() const { return maCbxInvert.IsChecked(); }
 };
 
 // ----------------------
@@ -182,12 +182,12 @@ private:
 public:
 
                     GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
-                                        USHORT nSepiaPercent );
+                                        sal_uInt16 nSepiaPercent );
                     ~GraphicFilterSepia();
 
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
-    USHORT          GetSepiaPercent() const
-    { return sal::static_int_cast< USHORT >(maMtrSepia.GetValue()); }
+    sal_uInt16          GetSepiaPercent() const
+    { return sal::static_int_cast< sal_uInt16 >(maMtrSepia.GetValue()); }
 };
 
 // -----------------------
@@ -204,11 +204,11 @@ private:
 public:
 
                     GraphicFilterPoster( Window* pParent, const Graphic& rGraphic,
-                                         USHORT nPosterColorCount );
+                                         sal_uInt16 nPosterColorCount );
                     ~GraphicFilterPoster();
 
     virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
-    USHORT          GetPosterColorCount() const { return( (USHORT) maNumPoster.GetValue() ); }
+    sal_uInt16          GetPosterColorCount() const { return( (sal_uInt16) maNumPoster.GetValue() ); }
 };
 
 // -----------------------
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index d7747385cce3..73aa971ef617 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -54,9 +54,9 @@ private :
     SfxStatusForwarder aRdOnlyForwarder;
 
 public :
-    SvxHlinkCtrl( USHORT nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg);
+    SvxHlinkCtrl( sal_uInt16 nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg);
 
-    virtual void    StateChanged( USHORT nSID, SfxItemState eState,
+    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                 const SfxPoolItem* pState );
 };
 
@@ -91,7 +91,7 @@ private:
     DECL_LINK (ClickCloseHdl_Impl, void * );
 
 protected:
-    virtual BOOL            Close();
+    virtual sal_Bool            Close();
     virtual void            Move();
 
 //    virtual long          PreNotify( NotifyEvent& rNEvt );
@@ -99,12 +99,12 @@ public:
     SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings );
     ~SvxHpLinkDlg ();
 
-    virtual void            PageCreated( USHORT nId, IconChoicePage& rPage );
+    virtual void            PageCreated( sal_uInt16 nId, IconChoicePage& rPage );
 
-    USHORT                  SetPage( SvxHyperlinkItem* pItem );
+    sal_uInt16                  SetPage( SvxHyperlinkItem* pItem );
     void                    EnableInetBrowse( sal_Bool bEnable = sal_True );
     void                    SetReadOnlyMode( sal_Bool bReadOnly = sal_False );
-    inline BOOL     IsHTMLDoc() const { return mbIsHTMLDoc; }
+    inline sal_Bool     IsHTMLDoc() const { return mbIsHTMLDoc; }
 
     inline SfxBindings*     GetBindings() const { return mpBindings; };
     inline SfxDispatcher*   GetDispatcher() const { return mpBindings->GetDispatcher(); }
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index e978edbdc1af..4e275d1583db 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -118,7 +118,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 );
 };
 
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index d1b835cd1966..76243b6a6046 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -50,7 +50,7 @@ class SvxJSearchOptionsPage;
 
 class SvxJSearchOptionsDialog : public SfxSingleTabDialog
 {
-    INT32                   nInitialTlFlags;
+    sal_Int32                   nInitialTlFlags;
     SvxJSearchOptionsPage  *pPage;
 
     // disallow copy-constructor and assignment-operator for now
@@ -60,13 +60,13 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog
 public:
     SvxJSearchOptionsDialog( Window *pParent,
                             const SfxItemSet& rOptionsSet,
-                            INT32 nInitialFlags  );
+                            sal_Int32 nInitialFlags  );
     virtual ~SvxJSearchOptionsDialog();
 
     // Window
     virtual void    Activate();
 
-    INT32           GetTransliterationFlags() const;
+    sal_Int32           GetTransliterationFlags() const;
 };
 
 #endif
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index c2ad3f7cc4a3..1c109923b147 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -59,13 +59,13 @@ private:
     ChangeType          mnGradientListState;
     ChangeType          mnHatchingListState;
 
-    USHORT              mnPageType;
-    USHORT              mnDlgType;
-    USHORT              mnPos;
-    BOOL                mbAreaTP;
-    BOOL                mbDeleteColorTable;
+    sal_uInt16              mnPageType;
+    sal_uInt16              mnDlgType;
+    sal_uInt16              mnPos;
+    sal_Bool                mbAreaTP;
+    sal_Bool                mbDeleteColorTable;
 
-    virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 protected:
     virtual short       Ok();
@@ -102,7 +102,7 @@ public:
     XBitmapList*         GetNewBitmapList() const { return mpNewBitmapList; }
     const XBitmapList*   GetBitmapList() const { return mpBitmapList; }
 
-    void                 DontDeleteColorTable() { mbDeleteColorTable = FALSE; }
+    void                 DontDeleteColorTable() { mbDeleteColorTable = sal_False; }
 };
 
 /*************************************************************************
@@ -119,10 +119,10 @@ class SvxTransparenceTabPage : public SvxTabPage
     const SfxItemSet&   rOutAttrs;
     RECT_POINT          eRP;
 
-    //CHINA001 UINT16*             pPageType;
-    //CHINA001 UINT16*             pDlgType;
-    UINT16             nPageType; //add CHINA001
-    UINT16             nDlgType;  //add CHINA001
+    //CHINA001 sal_uInt16*             pPageType;
+    //CHINA001 sal_uInt16*             pDlgType;
+    sal_uInt16             nPageType; //add CHINA001
+    sal_uInt16             nDlgType;  //add CHINA001
 
     // main selection
     FixedLine           aFlProp;
@@ -152,7 +152,7 @@ class SvxTransparenceTabPage : public SvxTabPage
     // preview
     SvxXRectPreview     aCtlBitmapPreview;
     SvxXRectPreview     aCtlXRectPreview;
-    BOOL                bBitmap;
+    sal_Bool                bBitmap;
 
     XOutdevItemPool*    pXPool;
     XFillAttrSetItem    aXFillAttr;
@@ -167,30 +167,30 @@ class SvxTransparenceTabPage : public SvxTabPage
     DECL_LINK(ModifiedTrgrHdl_Impl, void*);
 #endif
 
-    void ActivateLinear(BOOL bActivate);
-    void ActivateGradient(BOOL bActivate);
+    void ActivateLinear(sal_Bool bActivate);
+    void ActivateGradient(sal_Bool bActivate);
     void SetControlState_Impl(XGradientStyle eXGS);
 
-    BOOL InitPreview ( const SfxItemSet& rSet );
-    void InvalidatePreview (BOOL bEnable = TRUE );
+    sal_Bool InitPreview ( const SfxItemSet& rSet );
+    void InvalidatePreview (sal_Bool bEnable = sal_True );
 
 public:
     SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs);
     void Construct();
 
     static SfxTabPage* Create(Window*, const SfxItemSet&);
-    static UINT16* GetRanges();
+    static sal_uInt16* GetRanges();
 
-    virtual BOOL FillItemSet(SfxItemSet&);
+    virtual sal_Bool FillItemSet(SfxItemSet&);
     virtual void Reset(const SfxItemSet&);
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet);
     virtual void PointChanged(Window* pWindow, RECT_POINT eRP);
 
-    //CHINA001 void SetPageType(UINT16 *pInType) { pPageType = pInType; }
-    //CHINA001 void SetDlgType(UINT16* pInType) { pDlgType = pInType; }
-    void SetPageType(UINT16 nInType) { nPageType = nInType; } //add CHINA001
-    void SetDlgType(UINT16 nInType) { nDlgType = nInType; }//add CHINA001
+    //CHINA001 void SetPageType(sal_uInt16 *pInType) { pPageType = pInType; }
+    //CHINA001 void SetDlgType(sal_uInt16* pInType) { pDlgType = pInType; }
+    void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } //add CHINA001
+    void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; }//add CHINA001
     virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
 };
 
@@ -257,14 +257,14 @@ private:
     ChangeType*         pnGradientListState;
     ChangeType*         pnHatchingListState;
 
-    //CHINA001 USHORT*             pPageType;
-    //CHINA001 USHORT*             pDlgType;
-    //CHINA001 USHORT*             pPos;
-    UINT16 nPageType; //add CHINA001
-    UINT16 nDlgType;//add CHINA001
-    UINT16 nPos; //add CHINA001
+    //CHINA001 sal_uInt16*             pPageType;
+    //CHINA001 sal_uInt16*             pDlgType;
+    //CHINA001 sal_uInt16*             pPos;
+    sal_uInt16 nPageType; //add CHINA001
+    sal_uInt16 nDlgType;//add CHINA001
+    sal_uInt16 nPos; //add CHINA001
 
-    BOOL*               pbAreaTP;
+    sal_Bool*               pbAreaTP;
 
     XOutdevItemPool*    pXPool;
     XFillAttrSetItem    aXFillAttr;
@@ -298,9 +298,9 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  sal_uInt16*     GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
     virtual void ActivatePage( const SfxItemSet& rSet );
     virtual int  DeactivatePage( SfxItemSet* pSet );
@@ -313,13 +313,13 @@ public:
                 { pHatchingList = pHtchLst; }
     void    SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
 
-    //CHINA001 void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001
-    //CHINA001 void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }//add CHINA001
-    //CHINA001 void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetPos( UINT16 nInPos ) { nPos = nInPos; }//add CHINA001
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    //CHINA001 void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } //add CHINA001
+    //CHINA001 void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }//add CHINA001
+    //CHINA001 void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetPos( sal_uInt16 nInPos ) { nPos = nInPos; }//add CHINA001
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
     virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
     void    SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
@@ -356,12 +356,12 @@ private:
 
     XColorTable*        pColorTab;
     ChangeType*         pnColorTableState;
-    UINT16              nPageType;  //add CHINA001
-    UINT16              nDlgType;   //add CHINA001
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
+    sal_uInt16              nPageType;  //add CHINA001
+    sal_uInt16              nDlgType;   //add CHINA001
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
 
-    BOOL                bDisable;
+    sal_Bool                bDisable;
 
     XOutdevItemPool*    pXPool;
     XFillAttrSetItem    aXFillAttr;
@@ -378,23 +378,23 @@ public:
 
     void    Construct();
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  sal_uInt16*     GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
     virtual void ActivatePage( const SfxItemSet& rSet );
     virtual int  DeactivatePage( SfxItemSet* pSet );
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
 
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
-//CHINA001  void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-//CHINA001  void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }    //add CHINA001
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+//CHINA001  void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+//CHINA001  void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } //add CHINA001
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }    //add CHINA001
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
     virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
-    void    DisablePage( BOOL bIn ) { bDisable = bIn; }
+    void    DisablePage( sal_Bool bIn ) { bDisable = bIn; }
 };
 
 /*************************************************************************
@@ -441,10 +441,10 @@ private:
 
     ChangeType*         pnGradientListState;
     ChangeType*         pnColorTableState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -471,7 +471,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -481,10 +481,10 @@ public:
     void    SetGradientList( XGradientList* pGrdLst)
                 { pGradientList = pGrdLst; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
@@ -528,10 +528,10 @@ private:
 
     ChangeType*         pnHatchingListState;
     ChangeType*         pnColorTableState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -559,7 +559,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -571,10 +571,10 @@ public:
     void    SetHatchingList( XHatchList* pHtchLst)
                 { pHatchingList = pHtchLst; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
@@ -620,12 +620,12 @@ private:
 
     ChangeType*         pnBitmapListState;
     ChangeType*         pnColorTableState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
 
-    BOOL                bBmpChanged;
+    sal_Bool                bBmpChanged;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -653,7 +653,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -664,10 +664,10 @@ public:
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
     void    SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetBmpChgd( ChangeType* pIn ) { pnBitmapListState = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
@@ -730,11 +730,11 @@ private:
     XColorTable*        pColorTab;
 
     ChangeType*         pnColorTableState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
-    BOOL                bDeleteColorTable;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
+    sal_Bool                bDeleteColorTable;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -748,10 +748,10 @@ private:
 
 #ifdef _SVX_TPCOLOR_CXX
     void    ConvertColorValues (Color& rColor, ColorModel eModell);
-    void    RgbToCmyk_Impl( Color& rColor, USHORT& rK );
-    void    CmykToRgb_Impl( Color& rColor, const USHORT nKey );
-    USHORT  ColorToPercent_Impl( USHORT nColor );
-    USHORT  PercentToColor_Impl( USHORT nPercent );
+    void    RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK );
+    void    CmykToRgb_Impl( Color& rColor, const sal_uInt16 nKey );
+    sal_uInt16  ColorToPercent_Impl( sal_uInt16 nColor );
+    sal_uInt16  PercentToColor_Impl( sal_uInt16 nPercent );
 
     void    FillValueSet_Impl( ValueSet& rVs );
     //-----------------------------------------------------------------------------------------------------
@@ -777,7 +777,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -785,14 +785,14 @@ public:
 
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
 
-    void    SetDeleteColorTable( BOOL bIn ) { bDeleteColorTable = bIn; }
+    void    SetDeleteColorTable( sal_Bool bIn ) { bDeleteColorTable = bIn; }
 
     virtual void FillUserData();
 };
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 933a71616039..360c2bc99750 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -49,21 +49,21 @@ private:
     XDashList*          pNewDashList;
     XLineEndList*       pLineEndList;
     XLineEndList*       pNewLineEndList;
-    BOOL                bObjSelected;
+    sal_Bool                bObjSelected;
 
     ChangeType          nLineEndListState;
     ChangeType          nDashListState;
     ChangeType          mnColorTableState;
 
-    USHORT              nPageType;
-    USHORT              nDlgType;
-    USHORT              nPosDashLb;
-    USHORT              nPosLineEndLb;
-    USHORT              mnPos;
-    BOOL                mbAreaTP;
-    BOOL                mbDeleteColorTable;
+    sal_uInt16              nPageType;
+    sal_uInt16              nDlgType;
+    sal_uInt16              nPosDashLb;
+    sal_uInt16              nPosLineEndLb;
+    sal_uInt16              mnPos;
+    sal_Bool                mbAreaTP;
+    sal_Bool                mbDeleteColorTable;
 
-    virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 protected:
     virtual short       Ok();
@@ -75,7 +75,7 @@ protected:
 public:
     SvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr,
                       SdrModel* pModel, const SdrObject* pObj = NULL,
-                      BOOL bHasObj = TRUE );
+                      sal_Bool bHasObj = sal_True );
     ~SvxLineTabDialog();
 
     void             SetNewDashList( XDashList* pInLst)
@@ -148,15 +148,15 @@ private:
     List                aGrfNames;
     List                aGrfBrushItems;
     String              sNumCharFmtName;
-    BOOL                bLastWidthModified;
+    sal_Bool                bLastWidthModified;
     Size                aSymbolLastSize;
     Graphic             aSymbolGraphic;
     Size                aSymbolSize;
-    BOOL                bSymbols;
+    sal_Bool                bSymbols;
 
     const SfxItemSet&   rOutAttrs;
     RECT_POINT          eRP;
-    BOOL                bObjSelected;
+    sal_Bool                bObjSelected;
 
     XOutdevItemPool*    pXPool;
     XLineStyleItem      aXLStyle;
@@ -173,15 +173,15 @@ private:
     ChangeType*         pnLineEndListState;
     ChangeType*         pnDashListState;
     ChangeType*         pnColorTableState;
-    UINT16             nPageType; //add CHINA001
-    UINT16             nDlgType; //add CHINA001
-    USHORT*             pPosDashLb;
-    USHORT*             pPosLineEndLb;
+    sal_uInt16             nPageType; //add CHINA001
+    sal_uInt16             nDlgType; //add CHINA001
+    sal_uInt16*             pPosDashLb;
+    sal_uInt16*             pPosLineEndLb;
 
     SfxMapUnit          ePoolUnit;
 
     // #63083#
-    INT32               nActLineWidth;
+    sal_Int32               nActLineWidth;
 
     //Handler für Gallery-Popup-Menue-Button + Size
     DECL_LINK( GraphicHdl_Impl, MenuButton * );
@@ -201,13 +201,13 @@ private:
     // #116827#
     DECL_LINK( ChangeEdgeStyleHdl_Impl, void * );
 
-    BOOL FillXLSet_Impl();
+    sal_Bool FillXLSet_Impl();
 #endif
 
     void FillListboxes();
 public:
 
-    void ShowSymbolControls(BOOL bOn);
+    void ShowSymbolControls(sal_Bool bOn);
 
     SvxLineTabPage( Window* pParent, const SfxItemSet& rInAttrs );
     virtual ~SvxLineTabPage();
@@ -216,9 +216,9 @@ public:
 
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    static  USHORT*    GetRanges();
+    static  sal_uInt16*    GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet& );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -231,12 +231,12 @@ public:
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
     void    SetDashList( XDashList* pDshLst ) { pDashList = pDshLst; }
     void    SetLineEndList( XLineEndList* pLneEndLst) { pLineEndList = pLneEndLst; }
-    void    SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; }
+    void    SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
 
-    void    SetPageType( UINT16 nInType ) { nPageType = nInType; }//CHINA001 void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }    //CHINA001 void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPosDashLb( USHORT* pInPos ) { pPosDashLb = pInPos; }
-    void    SetPosLineEndLb( USHORT* pInPos ) { pPosLineEndLb = pInPos; }
+    void    SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }//CHINA001 void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }    //CHINA001 void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPosDashLb( sal_uInt16* pInPos ) { pPosDashLb = pInPos; }
+    void    SetPosLineEndLb( sal_uInt16* pInPos ) { pPosLineEndLb = pInPos; }
 
     void    SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
     void    SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
@@ -281,7 +281,7 @@ private:
 
     const SfxItemSet&   rOutAttrs;
     XDash               aDash;
-    BOOL                bObjSelected;
+    sal_Bool                bObjSelected;
 
     XOutdevItemPool*    pXPool;
     XLineStyleItem      aXLStyle;
@@ -294,9 +294,9 @@ private:
     XDashList*          pDashList;
 
     ChangeType*         pnDashListState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPosDashLb;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPosDashLb;
 
     SfxMapUnit          ePoolUnit;
     FieldUnit           eFUnit;
@@ -326,18 +326,18 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
     virtual int  DeactivatePage( SfxItemSet* pSet );
 
     void    SetDashList( XDashList* pDshLst ) { pDashList = pDshLst; }
-    void    SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; }
+    void    SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPosDashLb( USHORT* pInPos ) { pPosDashLb = pInPos; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPosDashLb( sal_uInt16* pInPos ) { pPosDashLb = pInPos; }
 
     void    SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
 
@@ -371,7 +371,7 @@ private:
 
     const SfxItemSet&   rOutAttrs;
     const SdrObject*    pPolyObj;
-    BOOL                bObjSelected;
+    sal_Bool                bObjSelected;
 
     XOutdevItemPool*    pXPool;
     XLineStyleItem      aXLStyle;
@@ -383,9 +383,9 @@ private:
     XLineEndList*       pLineEndList;
 
     ChangeType*         pnLineEndListState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPosLineEndLb;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPosLineEndLb;
 
 #ifdef _SVX_TPLNEEND_CXX
     DECL_LINK( ClickAddHdl_Impl, void * );
@@ -406,7 +406,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -414,11 +414,11 @@ public:
 
     void    SetLineEndList( XLineEndList* pInList ) { pLineEndList = pInList; }
     void    SetPolyObj( const SdrObject* pObj ) { pPolyObj = pObj; }
-    void    SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; }
+    void    SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPosLineEndLb( USHORT* pInPos ) { pPosLineEndLb = pInPos; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPosLineEndLb( sal_uInt16* pInPos ) { pPosLineEndLb = pInPos; }
 
     void    SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
 
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index b89ec4e779a0..d069933f13ef 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -62,8 +62,8 @@ namespace svx
         HeaderBar*          pHeaderBar;
         ::svx::OptHeaderTabListBox* pPathBox;
         SvLBoxEntry*        m_pCurEntry;
-        ULONG               m_nOldCount;
-        BOOL                m_bModified;
+        sal_uLong               m_nOldCount;
+        sal_Bool                m_bModified;
 
 #ifdef SVX_DBREGISTER_HXX
         DECL_LINK( NewHdl, void * );
@@ -102,9 +102,9 @@ namespace svx
         virtual ~DbRegistrationOptionsPage();
 
         static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-        static USHORT*      GetRanges();
+        static sal_uInt16*      GetRanges();
 
-        virtual BOOL        FillItemSet( SfxItemSet& rSet );
+        virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
         virtual void        Reset( const SfxItemSet& rSet );
         virtual void        FillUserData();
     };
diff --git a/cui/source/inc/defdlgname.hxx b/cui/source/inc/defdlgname.hxx
index 3342d66968a2..273aabcdb3ff 100644
--- a/cui/source/inc/defdlgname.hxx
+++ b/cui/source/inc/defdlgname.hxx
@@ -29,8 +29,8 @@
 
 // define ----------------------------------------------------------------
 
-#define MESS_BTN_1  ((USHORT)0)
-#define MESS_BTN_2  ((USHORT)1)
+#define MESS_BTN_1  ((sal_uInt16)0)
+#define MESS_BTN_2  ((sal_uInt16)1)
 
 // const -----------------------------------------------------------------
 
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 173ef8e45139..e0e0a05cc9d3 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -195,7 +195,7 @@ public:
     SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg = NULL );
     ~SvxMessDialog();
 
-    void    SetButtonText( USHORT nBtnId, const String& rNewTxt );
+    void    SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt );
 };
 
 
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index ef28d21c915e..1100f76ccbe6 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -93,8 +93,8 @@ public:
 
     static SfxTabPage* Create(Window*, const SfxItemSet&,
         SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
-    static UINT16* GetRanges();
-    virtual BOOL FillItemSet(SfxItemSet&);
+    static sal_uInt16* GetRanges();
+    virtual sal_Bool FillItemSet(SfxItemSet&);
     virtual void Reset(const SfxItemSet&);
     virtual void PointChanged(Window* pWindow, RECT_POINT eRP);
 
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 91d6e89e61dd..ab3ff52318a6 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -106,9 +106,9 @@ class SvxGrfCropPage : public SfxTabPage
     const MetricField*  pLastCropField;
     long            nOldWidth;
     long            nOldHeight;
-    BOOL            bReset;
-    BOOL            bInitialized;
-    BOOL            bSetOrigSize;
+    sal_Bool            bReset;
+    sal_Bool            bInitialized;
+    sal_Bool            bSetOrigSize;
 
 
     SvxGrfCropPage( Window *pParent, const SfxItemSet &rSet );
@@ -124,14 +124,14 @@ class SvxGrfCropPage : public SfxTabPage
 
     void            CalcZoom();
     void            CalcMinMaxBorder();
-    void            GraphicHasChanged(BOOL bFound);
+    void            GraphicHasChanged(sal_Bool bFound);
     virtual void    ActivatePage(const SfxItemSet& rSet);
 
     Size            GetGrfOrigSize( const Graphic& ) const;
 public:
     static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet );
 
-    virtual BOOL FillItemSet( SfxItemSet &rSet );
+    virtual sal_Bool FillItemSet( SfxItemSet &rSet );
     virtual void Reset( const SfxItemSet &rSet );
     virtual int DeactivatePage( SfxItemSet *pSet );
 };
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 6c344cec81c5..ca8a2142764d 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -75,11 +75,11 @@ namespace svx
 
         void Clear();
         void InsertEntry( const XubString& rStr );
-        void SelectEntryPos( USHORT nPos );
+        void SelectEntryPos( sal_uInt16 nPos );
 
-        USHORT GetEntryCount() const;
+        sal_uInt16 GetEntryCount() const;
 
-        XubString GetEntry( USHORT nPos ) const;
+        XubString GetEntry( sal_uInt16 nPos ) const;
         XubString GetSelectEntry() const;
 
         virtual void StateChanged( StateChangedType nStateChange );
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index ecf59a426528..14eeb5c77933 100644..100755
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -50,7 +50,7 @@ public:
     void                        ConnectElements( void );
                                     // should be called after all manipulations on elements are done
                                     // calcs real sizes depending on sizes of this
-    void                        Show( BOOL bVisible = TRUE, USHORT nFlags = 0 );    // same meaning as Windows::Show()
+    void                        Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 );    // same meaning as Windows::Show()
     void                        Enable( bool bEnable = true, bool bChild = true );  // same meaning as Windows::Enable()
 };
 
diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index 9859fc9c0f80..81fbc89eee67 100644
--- a/cui/source/inc/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
@@ -52,7 +52,7 @@ private:
 
     DECL_LINK (ClickNewHdl_Impl          , void * );        // Button : New
 
-    Image GetImage( USHORT nId );
+    Image GetImage( sal_uInt16 nId );
 
 protected:
     void FillDlgFields     ( String& aStrURL );
@@ -66,7 +66,7 @@ public:
 
     static  IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet );
 
-    virtual BOOL        AskApply ();
+    virtual sal_Bool        AskApply ();
     virtual void        DoApply ();
 
     virtual void        SetInitFocus();
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index 08bfd4d9d308..7eae2afd6b7f 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -52,7 +52,7 @@ private:
 
     String              maStrURL;
 
-    BOOL                mbMarkWndOpen;
+    sal_Bool                mbMarkWndOpen;
 
     DECL_LINK (ClickFileopenHdl_Impl  , void * );       // Button : Fileopen
     DECL_LINK (ClickTargetHdl_Impl    , void * );       // Button : Target
@@ -74,8 +74,8 @@ protected:
     void GetCurentItemData ( String& aStrURL, String& aStrName,
                              String& aStrIntName, String& aStrFrame,
                              SvxLinkInsertMode& eMode );
-    virtual BOOL   ShouldOpenMarkWnd () {return mbMarkWndOpen;}
-    virtual void   SetMarkWndShouldOpen (BOOL bOpen) {mbMarkWndOpen=bOpen;}
+    virtual sal_Bool   ShouldOpenMarkWnd () {return mbMarkWndOpen;}
+    virtual void   SetMarkWndShouldOpen (sal_Bool bOpen) {mbMarkWndOpen=bOpen;}
     String GetCurrentURL    ();
 
 public:
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index e39bb20900af..36f5919c02e7 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -57,7 +57,7 @@ private:
     String              maStrOldUser;
     String              maStrOldPassword;
 
-    BOOL                mbMarkWndOpen;
+    sal_Bool                mbMarkWndOpen;
 
     String              maStrStdDocURL;
 
@@ -88,8 +88,8 @@ protected:
     virtual void GetCurentItemData ( String& aStrURL, String& aStrName,
                                      String& aStrIntName, String& aStrFrame,
                                      SvxLinkInsertMode& eMode );
-    virtual BOOL ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );}
-    virtual void SetMarkWndShouldOpen (BOOL bOpen) {mbMarkWndOpen=bOpen;}
+    virtual sal_Bool ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );}
+    virtual void SetMarkWndShouldOpen (sal_Bool bOpen) {mbMarkWndOpen=bOpen;}
 
 public:
     SvxHyperlinkInternetTp ( Window *pParent, const SfxItemSet& rItemSet);
@@ -98,7 +98,7 @@ public:
     static  IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet );
 
     virtual void        SetMarkStr ( String& aStrMark );
-    virtual void        SetOnlineMode( BOOL bEnable );
+    virtual void        SetOnlineMode( sal_Bool bEnable );
 
     virtual void        SetInitFocus();
 };
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 615e2e56bdc3..d466d145b2ee 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -73,17 +73,17 @@ private:
     //SvTreeListBox maLbTree;
     SvxHlmarkTreeLBox maLbTree;
 
-    BOOL            mbUserMoved;
-    BOOL            mbFirst;
+    sal_Bool            mbUserMoved;
+    sal_Bool            mbFirst;
 
     SvxHyperlinkTabPageBase* mpParent;
 
     String          maStrLastURL;
 
-    USHORT          mnError;
+    sal_uInt16          mnError;
 
 protected:
-    BOOL RefreshFromDoc( ::rtl::OUString aURL );
+    sal_Bool RefreshFromDoc( ::rtl::OUString aURL );
 
     SvLBoxEntry* FindEntry ( String aStrName );
     void ClearTree();
@@ -98,13 +98,13 @@ public:
     SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent);
     ~SvxHlinkDlgMarkWnd();
 
-    BOOL MoveTo ( Point aNewPos );
+    sal_Bool MoveTo ( Point aNewPos );
     void RefreshTree ( String aStrURL );
     void SelectEntry ( String aStrMark );
 
-    BOOL ConnectToDialog( BOOL bDoit = TRUE );
+    sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True );
 
-    USHORT SetError( USHORT nError);
+    sal_uInt16 SetError( sal_uInt16 nError);
 };
 
 
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 2adb0dbdd920..94ad06053cb4 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -80,9 +80,9 @@ public:
 class SvxHyperURLBox : public SvtURLBox, public DropTargetHelper
 {
 private:
-    BOOL   mbAccessAddress;
+    sal_Bool   mbAccessAddress;
 
-//  String GetAllEmailNamesFromDragItem( USHORT nItem );
+//  String GetAllEmailNamesFromDragItem( sal_uInt16 nItem );
 
 protected:
 
@@ -95,7 +95,7 @@ protected:
     virtual long        PreNotify( NotifyEvent& rNEvt );
 
 public:
-    SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE, BOOL bAddresses = FALSE );
+    SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE, sal_Bool bAddresses = sal_False );
 
 };
 
@@ -127,7 +127,7 @@ private:
 protected:
     Window*             mpDialog;
 
-    BOOL                mbStdControlsInit;
+    sal_Bool                mbStdControlsInit;
 
     String              maStrInitURL;
 
@@ -151,7 +151,7 @@ protected:
 
     String              aEmptyStr;
 
-    BOOL            FileExists( const INetURLObject& rURL );
+    sal_Bool            FileExists( const INetURLObject& rURL );
     static String   GetSchemeFromURL( String aStrURL );
 
     inline void     DisableClose( sal_Bool _bDisable ) { mbIsCloseDisabled = _bDisable; }
@@ -170,27 +170,27 @@ public:
         mxDocumentFrame = rxDocumentFrame;
     }
 
-    virtual BOOL AskApply ();
+    virtual sal_Bool AskApply ();
     virtual void DoApply ();
-    virtual void SetOnlineMode( BOOL bEnable );
+    virtual void SetOnlineMode( sal_Bool bEnable );
     virtual void SetInitFocus();
     virtual void SetMarkStr ( String& aStrMark );
     virtual void Reset( const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void ActivatePage( const SfxItemSet& rItemSet );
     virtual int  DeactivatePage( SfxItemSet* pSet = 0 );
 
-    BOOL IsMarkWndVisible ()      { return ((Window*)mpMarkWnd)->IsVisible(); }
+    sal_Bool IsMarkWndVisible ()      { return ((Window*)mpMarkWnd)->IsVisible(); }
     Size GetSizeExtraWnd ()       { return ( mpMarkWnd->GetSizePixel() ); }
-    BOOL MoveToExtraWnd ( Point aNewPos, BOOL bDisConnectDlg = FALSE );
+    sal_Bool MoveToExtraWnd ( Point aNewPos, sal_Bool bDisConnectDlg = sal_False );
 
     virtual void        ActivatePage();
     virtual void        DeactivatePage();
     virtual sal_Bool    QueryClose();
 
 protected:
-    virtual BOOL ShouldOpenMarkWnd();
-    virtual void SetMarkWndShouldOpen(BOOL bOpen);
+    virtual sal_Bool ShouldOpenMarkWnd();
+    virtual void SetMarkWndShouldOpen(sal_Bool bOpen);
 
     void ShowMarkWnd ();
     void HideMarkWnd ()           { ( ( Window* ) mpMarkWnd )->Hide(); }
@@ -198,10 +198,10 @@ protected:
 
     SfxDispatcher* GetDispatcher() const;
 
-    USHORT             GetMacroEvents();
+    sal_uInt16             GetMacroEvents();
     SvxMacroTableDtor* GetMacroTable();
 
-    BOOL IsHTMLDoc() const;
+    sal_Bool IsHTMLDoc() const;
 };
 
 #endif // _SVX_TABBASE_HYPERLINK_HXX
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 35f010583fb9..6c2cb24c63fa 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -52,7 +52,7 @@ class IconChoicePage;
 
 // Create-Function
 typedef IconChoicePage* (*CreatePage)(Window *pParent, const SfxItemSet &rAttrSet);
-typedef USHORT*         (*GetPageRanges)(); // liefert internationale Which-Wert
+typedef sal_uInt16*         (*GetPageRanges)(); // liefert internationale Which-Wert
 
 // page-list
 DECLARE_LIST( IconChoicePageList, IconChoicePageData * )
@@ -68,21 +68,21 @@ enum EIconChoicePos { PosLeft, PosRight, PosTop, PosBottom };
 
 struct IconChoicePageData
 {
-    USHORT nId;                  // Die ID
+    sal_uInt16 nId;                  // Die ID
     CreatePage fnCreatePage;     // Pointer auf die Factory
     GetPageRanges fnGetRanges;// Pointer auf die Ranges-Funktion
     IconChoicePage* pPage;       // 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
-    IconChoicePageData( USHORT Id, CreatePage fnPage, GetPageRanges fnRanges, BOOL bDemand )
+    IconChoicePageData( sal_uInt16 Id, CreatePage fnPage, GetPageRanges fnRanges, sal_Bool bDemand )
         : nId           ( Id ),
           fnCreatePage  ( fnPage ),
           fnGetRanges   ( fnRanges ),
           pPage         ( NULL ),
           bOnDemand     ( bDemand ),
-          bRefresh      ( FALSE )
+          bRefresh      ( sal_False )
     {}
 };
 
@@ -100,9 +100,9 @@ class IconChoicePage : public TabPage
 private :
     const SfxItemSet*   pSet;
     String              aUserString;
-    BOOL                bHasExchangeSupport;
+    sal_Bool                bHasExchangeSupport;
     IconChoiceDialog*   pDialog;
-    BOOL                bStandard;
+    sal_Bool                bStandard;
 
     void                SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; }
     IconChoiceDialog*   GetDialog() const { return pDialog; }
@@ -114,19 +114,19 @@ private :
 protected :
     IconChoicePage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet );
 
-    USHORT              GetSlot( USHORT nWhich ) const  { return pSet->GetPool()->GetSlotId( nWhich ); }
-    USHORT              GetWhich( USHORT nSlot ) const  { return pSet->GetPool()->GetWhich( nSlot ); }
+    sal_uInt16              GetSlot( sal_uInt16 nWhich ) const  { return pSet->GetPool()->GetSlotId( nWhich ); }
+    sal_uInt16              GetWhich( sal_uInt16 nSlot ) const  { return pSet->GetPool()->GetWhich( nSlot ); }
 
 public :
     virtual             ~IconChoicePage();
 
     const SfxItemSet&   GetItemSet() const { return *pSet; }
 
-    virtual BOOL        FillItemSet( SfxItemSet& ) = 0;
+    virtual sal_Bool        FillItemSet( SfxItemSet& ) = 0;
     virtual void        Reset( const SfxItemSet& ) = 0;
 
-    BOOL                HasExchangeSupport() const              { return bHasExchangeSupport; }
-    void                SetExchangeSupport( BOOL bNew = TRUE )  { bHasExchangeSupport = bNew; }
+    sal_Bool                HasExchangeSupport() const              { return bHasExchangeSupport; }
+    void                SetExchangeSupport( sal_Bool bNew = sal_True )  { bHasExchangeSupport = bNew; }
 
     enum {
         KEEP_PAGE = 0x0000,     // Fehlerbehandlung; Seite nicht wechseln
@@ -143,7 +143,7 @@ public :
     void                SetUserData(const String& rString)  { aUserString = rString; }
     String              GetUserData() { return aUserString; }
     virtual void        FillUserData();
-    virtual BOOL        IsReadOnly() const;
+    virtual sal_Bool        IsReadOnly() const;
     virtual sal_Bool    QueryClose();
 
     void                StateChanged( StateChangedType nType );
@@ -166,7 +166,7 @@ private :
 
     SvtIconChoiceCtrl       maIconCtrl;     // DAS IconChoice-Control
 
-    USHORT                  mnCurrentPageId;    // Id der aktuell sichtbaren Page
+    sal_uInt16                  mnCurrentPageId;    // Id der aktuell sichtbaren Page
 
     // Buttons
     OKButton                aOKBtn;
@@ -177,43 +177,43 @@ private :
     const SfxItemSet*       pSet;
     SfxItemSet*             pOutSet;
     SfxItemSet*             pExampleSet;
-    USHORT*                 pRanges;
+    sal_uInt16*                 pRanges;
 
     sal_uInt32              nResId;
 
-    BOOL                    bHideResetBtn;
-    BOOL                    bModal;
-    BOOL                    bInOK;
-    BOOL                    bModified;
-    BOOL                    bItemsReset;
+    sal_Bool                    bHideResetBtn;
+    sal_Bool                    bModal;
+    sal_Bool                    bInOK;
+    sal_Bool                    bModified;
+    sal_Bool                    bItemsReset;
 
     DECL_LINK ( ChosePageHdl_Impl, void * );
     DECL_LINK ( OkHdl,             Button * );
     DECL_LINK ( ResetHdl,          Button * );
     DECL_LINK ( CancelHdl,         Button * );
 
-    IconChoicePageData*     GetPageData ( USHORT nId );
+    IconChoicePageData*     GetPageData ( sal_uInt16 nId );
     void                    Start_Impl();
-    BOOL                    OK_Impl();
+    sal_Bool                    OK_Impl();
 
-    void                    SetPosSizeCtrls ( BOOL bInit = FALSE );
-    void                    SetPosSizePages ( USHORT nId );
+    void                    SetPosSizeCtrls ( sal_Bool bInit = sal_False );
+    void                    SetPosSizePages ( sal_uInt16 nId );
 
-    void                    FocusOnIcon ( USHORT nId );
+    void                    FocusOnIcon ( sal_uInt16 nId );
 
 protected :
     void                    ShowPageImpl ( IconChoicePageData* pData );
     void                    HidePageImpl ( IconChoicePageData* pData );
 
-    virtual void            PageCreated( USHORT nId, IconChoicePage& rPage );
-    virtual SfxItemSet*     CreateInputItemSet( USHORT nId );
+    virtual void            PageCreated( sal_uInt16 nId, IconChoicePage& rPage );
+    virtual SfxItemSet*     CreateInputItemSet( sal_uInt16 nId );
     inline SfxItemSet*      GetInputSetImpl() { return (SfxItemSet*)pSet; }
-    inline IconChoicePage*  GetTabPage( USHORT nPageId )
+    inline IconChoicePage*  GetTabPage( sal_uInt16 nPageId )
                                 { return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage:NULL); }
     const SfxItemSet*       GetRefreshedSet();
 
     void                    ActivatePageImpl ();
-    BOOL                    DeActivatePageImpl ();
+    sal_Bool                    DeActivatePageImpl ();
     void                    ResetPageImpl ();
 
     short                   Ok();
@@ -237,16 +237,16 @@ public :
     //
 
     SvxIconChoiceCtrlEntry* AddTabPage(
-        USHORT nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC,
+        sal_uInt16 nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC,
         CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
-        BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
+        sal_Bool bItemsOnDemand = sal_False, sal_uLong nPos = LIST_APPEND );
 
-    void                SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
-    USHORT              GetCurPageId() const       { return mnCurrentPageId; }
-    void                ShowPage( USHORT nId );
+    void                SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
+    sal_uInt16              GetCurPageId() const       { return mnCurrentPageId; }
+    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; }
 
@@ -258,7 +258,7 @@ public :
     HelpButton&         GetHelpButton() { return aHelpBtn; }
 
     short               Execute();
-    void                Start( BOOL bShow = TRUE );
+    void                Start( sal_Bool bShow = sal_True );
     sal_Bool            QueryClose();
 
     const SfxItemSet*   GetExampleSet() const { return pExampleSet; }
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index a93b93498d37..aeab4d94dbf8 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -56,7 +56,7 @@ public:
     com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject()
                         { return m_xObj; }
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType );
-    virtual BOOL IsCreateNew() const;
+    virtual sal_Bool IsCreateNew() const;
 };
 
 class SvInsertOleDlg : public InsertObjectDialog_Impl
@@ -85,8 +85,8 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
     ListBox&            GetObjectTypes()
                         { return aLbObjecttype; }
     String              GetFilePath() const { return aEdFilepath.GetText(); }
-    BOOL                IsLinked() const    { return aCbFilelink.IsChecked(); }
-    BOOL                IsCreateNew() const { return aRbNewObject.IsChecked(); }
+    sal_Bool                IsLinked() const    { return aCbFilelink.IsChecked(); }
+    sal_Bool                IsCreateNew() const { return aRbNewObject.IsChecked(); }
 
 public:
                         SvInsertOleDlg( Window* pParent,
diff --git a/cui/source/inc/internationaloptions.hxx b/cui/source/inc/internationaloptions.hxx
index f95be661f53c..f5c6e919fdac 100644
--- a/cui/source/inc/internationaloptions.hxx
+++ b/cui/source/inc/internationaloptions.hxx
@@ -42,7 +42,7 @@ namespace offapp
     protected:
                             InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet );
 
-        virtual BOOL        FillItemSet( SfxItemSet& _rSet );
+        virtual sal_Bool        FillItemSet( SfxItemSet& _rSet );
         virtual void        Reset( const SfxItemSet& _rSet );
 
     public:
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 95e30d241467..ac1269062721 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -72,23 +72,23 @@ private:
     String          aStrVertList;
 
     short           nCaptionType;
-    BOOL            bFixedAngle;
-    INT32           nFixedAngle;
-    INT32           nGap;
+    sal_Bool            bFixedAngle;
+    sal_Int32           nFixedAngle;
+    sal_Int32           nGap;
     short           nEscDir;
-    BOOL            bEscRel;
-    INT32           nEscAbs;
-    INT32           nEscRel;
-    INT32           nLineLen;
-    BOOL            bFitLineLen;
+    sal_Bool            bEscRel;
+    sal_Int32           nEscAbs;
+    sal_Int32           nEscRel;
+    sal_Int32           nLineLen;
+    sal_Bool            bFitLineLen;
 
-    USHORT          nAnsatzRelPos;
-    USHORT          nAnsatzTypePos;
-    USHORT          nWinkelTypePos;
+    sal_uInt16          nAnsatzRelPos;
+    sal_uInt16          nAnsatzTypePos;
+    sal_uInt16          nWinkelTypePos;
 
 #ifdef _SVX_LABDLG_CXX
-    void            SetupAnsatz_Impl( USHORT nType );
-    void            SetupType_Impl( USHORT nType );
+    void            SetupAnsatz_Impl( sal_uInt16 nType );
+    void            SetupType_Impl( sal_uInt16 nType );
     DECL_LINK( AnsatzSelectHdl_Impl, ListBox * );
     DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox * );
     DECL_LINK( LineOptHdl_Impl, Button * );
@@ -103,9 +103,9 @@ public:
     virtual ~SvxCaptionTabPage();
 
     static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet & );
     void                Construct();
     void                SetView( const SdrView* pSdrView )
@@ -122,16 +122,16 @@ class SvxCaptionTabDialog : public SfxTabDialog
 private:
 //  const SfxItemSet&   rOutAttrs;
     const SdrView*      pView;
-    USHORT              nAnchorCtrls;
+    sal_uInt16              nAnchorCtrls;
 
     Link                aValidateLink;
 
-    virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 public:
 
             SvxCaptionTabDialog(Window* pParent, const SdrView* pView,
-                                    USHORT nAnchorTypes = 0 );
+                                    sal_uInt16 nAnchorTypes = 0 );
 
             ~SvxCaptionTabDialog();
 
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index f6f75ddee89d..114e62679844 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -81,7 +81,7 @@ class SvBaseLinksDlg : public ModalDialog
     String aStrCloselinkmsgMulti;
     String aStrWaitinglink;
     sfx2::LinkManager*  pLinkMgr;
-    BOOL            bHtmlMode;
+    sal_Bool            bHtmlMode;
     SvTabListBox aTbLinks;
     Timer aUpdateTimer;
 
@@ -96,10 +96,10 @@ class SvBaseLinksDlg : public ModalDialog
     DECL_LINK( BreakLinkClickHdl, PushButton * );
     DECL_LINK( UpdateWaitingHdl, Timer * );
     DECL_LINK( EndEditHdl, sfx2::SvBaseLink* );
-    sfx2::SvBaseLink* GetSelEntry( USHORT* pPos );
+    sfx2::SvBaseLink* GetSelEntry( sal_uInt16* pPos );
     String ImplGetStateStr( const sfx2::SvBaseLink& );
-    void SetType( sfx2::SvBaseLink& rLink, USHORT nPos, USHORT nType );
-    void InsertEntry( const sfx2::SvBaseLink& rLink, USHORT nPos = LISTBOX_APPEND, sal_Bool bSelect = sal_False);
+    void SetType( sfx2::SvBaseLink& rLink, sal_uInt16 nPos, sal_uInt16 nType );
+    void InsertEntry( const sfx2::SvBaseLink& rLink, sal_uInt16 nPos = LISTBOX_APPEND, sal_Bool bSelect = sal_False);
 #endif
 
     void StartUpdateTimer()         { aUpdateTimer.Start(); }
@@ -126,7 +126,7 @@ class SvBaseLinksDlg : public ModalDialog
     void SetManager( sfx2::LinkManager* );
 
 public:
-    SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, BOOL bHtml = FALSE );
+    SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, sal_Bool bHtml = sal_False );
     ~SvBaseLinksDlg();
     void SetActLink( sfx2::SvBaseLink * pLink );
 };
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index d2a5a5cb3326..7ffd559680f3 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -72,7 +72,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 );
@@ -82,10 +82,10 @@ public:
     virtual void                PageCreated (SfxAllItemSet aSet);
 
     // --------- Erben aus der Basis -------------
-    virtual BOOL                FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool                FillItemSet( SfxItemSet& rSet );
     virtual void                Reset( const SfxItemSet& rSet );
 
-    BOOL                        IsReadOnly() const;
+    sal_Bool                        IsReadOnly() const;
 };
 
 inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 7943c3ff6727..99614fd81172 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -48,9 +48,9 @@ typedef ::std::hash_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::O
 struct EventDisplayName
 {
     const sal_Char* pAsciiEventName;
-    USHORT          nEventResourceID;
+    sal_uInt16          nEventResourceID;
     EventDisplayName() : pAsciiEventName( NULL ), nEventResourceID(0) { }
-    EventDisplayName( const sal_Char* _pAsciiName, const USHORT _nResId )
+    EventDisplayName( const sal_Char* _pAsciiName, const sal_uInt16 _nResId )
         : pAsciiEventName( _pAsciiName )
         , nEventResourceID( _nResId )
     {
@@ -100,14 +100,14 @@ public:
     void                        InitResources();
 
     void                        InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable );
-    virtual BOOL                FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool                FillItemSet( SfxItemSet& rSet );
 
     using SfxTabPage::Reset;
     virtual void                Reset();
 
     void                        DisplayAppEvents( bool appEvents);
-    void                        SetReadOnly( BOOL bSet );
-    BOOL                        IsReadOnly() const;
+    void                        SetReadOnly( sal_Bool bSet );
+    sal_Bool                        IsReadOnly() const;
 };
 
 class SvxMacroTabPage : public _SvxMacroTabPage
@@ -125,12 +125,12 @@ public:
 
 // class SvxMacroAssignDlg --------------------------------------------------
 
-typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Werte
+typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte
 
 class SvxMacroAssignSingleTabDialog : public SfxModalDialog
 {
 public:
-    SvxMacroAssignSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, USHORT nUniqueId );
+    SvxMacroAssignSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, sal_uInt16 nUniqueId );
 
     virtual             ~SvxMacroAssignSingleTabDialog();
 
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index ddc6f62e6e8a..87129f34c222 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -80,7 +80,7 @@ private:
     const SdrView*      pView;
     SfxMapUnit          eUnit;
 
-    BOOL                bPositionModified;
+    sal_Bool                bPositionModified;
 
 #ifdef _SVX_MEASURE_CXX
     void                FillUnitLB();
@@ -95,9 +95,9 @@ public:
     ~SvxMeasurePage();
 
     static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  sal_uInt16*     GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet & );
 
     virtual void        PointChanged( Window* pWindow, RECT_POINT eRP );
diff --git a/cui/source/inc/multifil.hxx b/cui/source/inc/multifil.hxx
index 8d86e99b731c..1bb4e8c85ef1 100644
--- a/cui/source/inc/multifil.hxx
+++ b/cui/source/inc/multifil.hxx
@@ -47,7 +47,7 @@ private:
     DECL_LINK( DelHdl_Impl, PushButton * );
 
 public:
-    SvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE );
+    SvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False );
     ~SvxMultiFileDialog();
 
     String  GetFiles() const { return SvxMultiPathDialog::GetPath(); }
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index 44e8f15435fc..6e9df2f3ba04 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -75,7 +75,7 @@ protected:
     DECL_LINK( CheckHdl_Impl, svx::SvxRadioButtonListBox * );
 
 public:
-    SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE );
+    SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False );
     ~SvxMultiPathDialog();
 
     String          GetPath() const;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 92cc494faac4..b6f092788116 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -61,7 +61,7 @@ private:
     String          aPrevStr;
     Color           aPrevCol;
 
-    void            InitSettings( BOOL bForeground, BOOL bBackground );
+    void            InitSettings( sal_Bool bForeground, sal_Bool bBackground );
 
 protected:
     virtual void    Paint( const Rectangle& rRect );
@@ -91,9 +91,9 @@ public:
 #define SfxTabPage ::SfxTabPage
     static SfxTabPage*      Create( Window* pParent,
                                     const SfxItemSet& rAttrSet );
-    static USHORT*          GetRanges();
+    static sal_uInt16*          GetRanges();
 
-    virtual BOOL            FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool            FillItemSet( SfxItemSet& rSet );
     virtual void            Reset( const SfxItemSet& rSet );
     virtual int             DeactivatePage  ( SfxItemSet* pSet = NULL );
 
@@ -102,7 +102,7 @@ public:
                                 { SetInfoItem( rItem ); }
 
     void                    SetOkHdl( const Link& rOkHandler );
-    void                    HideLanguage(BOOL nFlag=TRUE);
+    void                    HideLanguage(sal_Bool nFlag=sal_True);
     virtual long            PreNotify( NotifyEvent& rNEvt );
     virtual void            PageCreated (SfxAllItemSet aSet); //add CHINA001
 private:
@@ -139,11 +139,11 @@ private:
 
     SvxNumberInfoItem*      pNumItem;
     SvxNumberFormatShell*   pNumFmtShell;
-    ULONG                   nInitFormat;
+    sal_uLong                   nInitFormat;
     Link                    fnOkHdl;
 
-    BOOL                    bNumItemFlag; //Fuer Handling mit DocShell
-    BOOL                    bOneAreaFlag;
+    sal_Bool                    bNumItemFlag; //Fuer Handling mit DocShell
+    sal_Bool                    bOneAreaFlag;
     short                   nFixedCategory;
 
     long                    nCatHeight;
@@ -160,16 +160,16 @@ private:
     void    Init_Impl();
     void    FillCurrencyBox();
     void    FillFormatListBox_Impl( SvxDelStrgs& rEntries );
-    void    UpdateOptions_Impl( BOOL bCheckCatChange );
-    void    UpdateFormatListBox_Impl( USHORT bCat, BOOL bUpdateEdit );
+    void    UpdateOptions_Impl( sal_Bool bCheckCatChange );
+    void    UpdateFormatListBox_Impl( sal_uInt16 bCat, sal_Bool bUpdateEdit );
     void    DeleteEntryList_Impl( SvxDelStrgs& rEntries );
     void    Obstructing();
     void    EnableBySourceFormat_Impl();
-    void    SetCategory( USHORT nPos );
+    void    SetCategory( sal_uInt16 nPos );
     String  GetExpColorString( Color*& rpPreviewColor, const String& aFormatStr, short nTmpCatPos );
     void    MakePreviewText( const String& rFormat );
-    void    ChangePreviewText( USHORT nPos );
-    void    AddAutomaticLanguage_Impl(LanguageType eAutoLang, BOOL bSelect);
+    void    ChangePreviewText( sal_uInt16 nPos );
+    void    AddAutomaticLanguage_Impl(LanguageType eAutoLang, sal_Bool bSelect);
     // Handler
     DECL_LINK( LostFocusHdl_Impl, Edit* pEd );
     DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* pLb );
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 47decd0ad9c7..f2a551a247b6 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -84,12 +84,12 @@ class SvxSingleNumPickTabPage : public SfxTabPage
     SvxNumSettingsArr_Impl  aNumSettingsArr;
     SvxNumRule*             pActNum;
     SvxNumRule*             pSaveNum;
-    USHORT                  nActNumLvl;
-    BOOL                    bModified   : 1;
-    BOOL                    bPreset     : 1;
+    sal_uInt16                  nActNumLvl;
+    sal_Bool                    bModified   : 1;
+    sal_Bool                    bPreset     : 1;
 
     String              sNumCharFmtName;
-    USHORT              nNumItemId;
+    sal_uInt16              nNumItemId;
 
     protected:
         DECL_LINK( NumSelectHdl_Impl, ValueSet*);
@@ -105,7 +105,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage
 
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
@@ -124,10 +124,10 @@ class SvxBulletPickTabPage : public SfxTabPage
     SvxNumValueSet*     pExamplesVS;
     SvxNumRule*         pActNum;
     SvxNumRule*         pSaveNum;
-    USHORT              nActNumLvl;
-    BOOL                bModified   : 1;
-    BOOL                bPreset     : 1;
-    USHORT              nNumItemId;
+    sal_uInt16              nActNumLvl;
+    sal_Bool                bModified   : 1;
+    sal_Bool                bPreset     : 1;
+    sal_uInt16              nNumItemId;
 
     String              sBulletCharFmtName;
     protected:
@@ -143,7 +143,7 @@ class SvxBulletPickTabPage : public SfxTabPage
 
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                SetCharFmtName(const String& rName){sBulletCharFmtName = rName;}
@@ -169,10 +169,10 @@ class SvxNumPickTabPage : public SfxTabPage
 
     SvxNumRule*         pActNum;
     SvxNumRule*         pSaveNum;
-    USHORT              nActNumLvl;
-    USHORT              nNumItemId;
-    BOOL                bModified   : 1;
-    BOOL                bPreset     : 1;
+    sal_uInt16              nActNumLvl;
+    sal_uInt16              nNumItemId;
+    sal_Bool                bModified   : 1;
+    sal_Bool                bPreset     : 1;
 
 
     protected:
@@ -189,7 +189,7 @@ class SvxNumPickTabPage : public SfxTabPage
 
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                SetCharFmtNames(const String& rCharName, const String& rBulName)
@@ -216,11 +216,11 @@ class SvxBitmapPickTabPage : public SfxTabPage
 
     SvxNumRule*         pActNum;
     SvxNumRule*         pSaveNum;
-    USHORT              nActNumLvl;
-    USHORT              nNumItemId;
+    sal_uInt16              nActNumLvl;
+    sal_uInt16              nNumItemId;
     SfxMapUnit          eCoreUnit;
-    BOOL                bModified   : 1;
-    BOOL                bPreset     : 1;
+    sal_Bool                bModified   : 1;
+    sal_Bool                bPreset     : 1;
 
     protected:
         DECL_LINK( NumSelectHdl_Impl, ValueSet*);
@@ -237,7 +237,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
 
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
@@ -299,25 +299,25 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
     Size                aInitSize[SVX_MAX_NUM];
 
-    BOOL                bLastWidthModified  : 1;
-    BOOL                bModified           : 1;
-    BOOL                bPreset             : 1;
-    BOOL                bAutomaticCharStyles: 1;
-    BOOL                bHTMLMode           : 1;
-    BOOL                bMenuButtonInitialized : 1;
+    sal_Bool                bLastWidthModified  : 1;
+    sal_Bool                bModified           : 1;
+    sal_Bool                bPreset             : 1;
+    sal_Bool                bAutomaticCharStyles: 1;
+    sal_Bool                bHTMLMode           : 1;
+    sal_Bool                bMenuButtonInitialized : 1;
 
     List                aGrfNames;
     Font                aActBulletFont;
     String              sBullet;
     String              sStartWith;
 
-    BYTE                nBullet;
-    USHORT              nActNumLvl;
-    USHORT              nNumItemId;
+    sal_uInt8               nBullet;
+    sal_uInt16              nActNumLvl;
+    sal_uInt16              nNumItemId;
     SfxMapUnit          eCoreUnit;
 
     void                InitControls();
-    void                SwitchNumberType( BYTE nType, BOOL bBmp = FALSE );
+    void                SwitchNumberType( sal_uInt8 nType, sal_Bool bBmp = sal_False );
     void                CheckForStartValue_Impl(sal_uInt16 nNumberingType);
 
         DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * );
@@ -348,7 +348,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
 //???   void                SetWrtShell(SwWrtShell* pSh);
@@ -360,7 +360,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
     void                SetMetric(FieldUnit eSet);
 
     ListBox&            GetCharFmtListBox() {return aCharFmtLB;}
-    void                SetModified(BOOL bRepaint = TRUE);
+    void                SetModified(sal_Bool bRepaint = sal_True);
     virtual void        PageCreated(SfxAllItemSet aSet); // add CHINA001
 };
 
@@ -415,13 +415,13 @@ class SvxNumPositionTabPage : public SfxTabPage
     SvxNumRule*         pActNum;
     SvxNumRule*         pSaveNum;
 
-    USHORT              nActNumLvl;
-    USHORT              nNumItemId;
+    sal_uInt16              nActNumLvl;
+    sal_uInt16              nNumItemId;
     SfxMapUnit          eCoreUnit;
 
-    BOOL                bModified           : 1;
-    BOOL                bPreset             : 1;
-    BOOL                bInInintControl     : 1;  //Modify-Fehler umgehen, soll ab 391 behoben sein
+    sal_Bool                bModified           : 1;
+    sal_Bool                bPreset             : 1;
+    sal_Bool                bInInintControl     : 1;  //Modify-Fehler umgehen, soll ab 391 behoben sein
     // --> OD 2008-01-11 #newlistlevelattrs#
     bool                bLabelAlignmentPosAndSpaceModeActive;
     // <--
@@ -451,14 +451,14 @@ public:
 
     virtual void        ActivatePage(const SfxItemSet& rSet);
     virtual int         DeactivatePage(SfxItemSet *pSet);
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
 
     void                SetMetric(FieldUnit eSet);
-    void                SetModified(BOOL bRepaint = TRUE);
+    void                SetModified(sal_Bool bRepaint = sal_True);
     virtual void        PageCreated(SfxAllItemSet aSet); // add CHINA001
 };
 
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index 3e13018398b5..6c18568b6292 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -72,8 +72,8 @@ public:
     virtual ~SvxAsianLayoutPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    static UINT16*      GetRanges();
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    static sal_uInt16*      GetRanges();
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 345623c19cff..27627b96c9f3 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -148,7 +148,7 @@ private:
     long                nWidth;
     sal_Bool            bFirstSelect;
     sal_Bool            bDoNothing;
-    BOOL                bDicIsReadonly;
+    sal_Bool                bDicIsReadonly;
 
 #ifdef _SVX_OPTDICT_CXX
     DECL_LINK( SelectBookHdl_Impl, ListBox * );
@@ -165,7 +165,7 @@ private:
                             ::com::sun::star::linguistic2::XDictionary >  &xDic );
 
     void            RemoveDictEntry(SvLBoxEntry* pEntry);
-    USHORT          GetLBInsertPos(const String &rDicWord);
+    sal_uInt16          GetLBInsertPos(const String &rDicWord);
 
 #endif
 
diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx
index 266c51944b09..c827417b669c 100644
--- a/cui/source/inc/optimprove.hxx
+++ b/cui/source/inc/optimprove.hxx
@@ -59,7 +59,7 @@ public:
     SvxImprovementPage( Window* pParent );
     ~SvxImprovementPage();
 
-    inline bool     IsYesChecked() const { return m_aYesRB.IsChecked() != FALSE; }
+    inline bool     IsYesChecked() const { return m_aYesRB.IsChecked() != sal_False; }
 
     inline String   GetPageText() const { return GetText(); }
     inline String   GetInvitationText() const { return m_aInvitationFT.GetText(); }
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 9220ed9bcfbc..26111e4bd0b0 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -86,7 +86,7 @@ class SvxEditModulesDlg : public ModalDialog
 
     SvLBoxButtonData*   pCheckButtonData;
 
-    SvLBoxEntry*    CreateEntry(String& rTxt, USHORT nCol);
+    SvLBoxEntry*    CreateEntry(String& rTxt, sal_uInt16 nCol);
 
 #ifdef _SVX_OPTLINGU_CXX
     DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
@@ -149,10 +149,10 @@ private:
     SvxLinguData_Impl*  pLinguData;
 
     SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet );
-    SvLBoxEntry*    CreateEntry(String& rTxt, USHORT nCol);
+    SvLBoxEntry*    CreateEntry(String& rTxt, sal_uInt16 nCol);
 
-    void    AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx );
-    ULONG   GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx );
+    void    AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
+    sal_uLong   GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
 
 #ifdef _SVX_OPTLINGU_CXX
     DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 2ac80aa64094..e73f390ad2f3 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -94,9 +94,9 @@ private:
 
     DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* );
 
-    void        GetPathList( USHORT _nPathHandle, String& _rInternalPath,
+    void        GetPathList( sal_uInt16 _nPathHandle, String& _rInternalPath,
                              String& _rUserPath, String& _rWritablePath, sal_Bool& _rReadOnly );
-    void        SetPathList( USHORT _nPathHandle,
+    void        SetPathList( sal_uInt16 _nPathHandle,
                              const String& _rUserPath, const String& _rWritablePath );
 #endif
 
@@ -105,9 +105,9 @@ public:
     ~SvxPathTabPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        FillUserData();
 };
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 9931d2d2cff1..053cbdcad8dc 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -85,7 +85,7 @@
 */
 
 struct  SvxPage_Impl;
-typedef USHORT MarginPosition;
+typedef sal_uInt16 MarginPosition;
 
 class SvxPageDescPage : public SfxTabPage
 {
@@ -165,7 +165,7 @@ class SvxPageDescPage : public SfxTabPage
     long                nLastBottomMargin;
 
     Size                aMaxSize;
-    BOOL                bLandscape;
+    sal_Bool                bLandscape;
     FASTBOOL            bBorderModified;
     SvxModeType         eMode;
     Paper               ePaperStart;
@@ -218,9 +218,9 @@ protected:
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rOutSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rOutSet );
     virtual void        Reset( const SfxItemSet& rSet );
     virtual void        FillUserData();
 
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 64a926f5ef89..49778aec5e81 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -108,13 +108,13 @@ private:
     long                    nAbst;
     long                    nWidth;
     long                    nMinFixDist;
-    BOOL                    bRelativeMode;
-    BOOL                    bNegativeIndents;
+    sal_Bool                    bRelativeMode;
+    sal_Bool                    bNegativeIndents;
 
 #ifdef _SVX_PARAGRPH_CXX
     void                    SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr );
     void                    Init_Impl();
-    void                    UpdateExample_Impl( BOOL bAll = FALSE );
+    void                    UpdateExample_Impl( sal_Bool bAll = sal_False );
 
     DECL_LINK( LineDistHdl_Impl, ListBox* );
     DECL_LINK( ModifyHdl_Impl, SvxRelativeField* );
@@ -128,13 +128,13 @@ public:
     DECL_LINK( ELRLoseFocusHdl, Edit* );
 
     static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*          GetRanges();
+    static sal_uInt16*          GetRanges();
 
-    virtual BOOL            FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool            FillItemSet( SfxItemSet& rSet );
     virtual void            Reset( const SfxItemSet& rSet );
 
 
-    void                    SetPageWidth( USHORT nPageWidth );
+    void                    SetPageWidth( sal_uInt16 nPageWidth );
     void                    EnableRelativeMode();
     void                    EnableRegisterMode();
     void                    EnableAutoFirstLine();
@@ -178,7 +178,7 @@ class SvxParaAlignTabPage : public SfxTabPage
     DECL_LINK(              LastLineHdl_Impl, ListBox* );
     DECL_LINK(              TextDirectionHdl_Impl, ListBox* );
 
-    void                    UpdateExample_Impl( BOOL bAll = FALSE );
+    void                    UpdateExample_Impl( sal_Bool bAll = sal_False );
 #endif
 
                             SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet );
@@ -189,9 +189,9 @@ protected:
 
 public:
     static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*          GetRanges();
+    static sal_uInt16*          GetRanges();
 
-    virtual BOOL            FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool            FillItemSet( SfxItemSet& rSet );
     virtual void            Reset( const SfxItemSet& rSet );
 
     void                    EnableJustifyExt();
@@ -223,9 +223,9 @@ public:
 
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     void                DisablePageBreak();
@@ -275,9 +275,9 @@ private:
     NumericField        aWidowRowNo;
     FixedText           aWidowRowLabel;
 
-    BOOL                bPageBreak;
-    BOOL                bHtmlMode;
-    USHORT              nStdPos;
+    sal_Bool                bPageBreak;
+    sal_Bool                bHtmlMode;
+    sal_uInt16              nStdPos;
 
 #ifdef _SVX_PARAGRPH_CXX
     DECL_LINK( PageBreakHdl_Impl, TriStateBox* );
@@ -314,9 +314,9 @@ public:
 
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
 };
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index a1b71e2f751e..f59c3612dc91 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -65,8 +65,8 @@ class SvPasteObjectDialog : public ModalDialog
     Table           aSupplementTable;
     SvGlobalName    aObjClassName;
     String          aObjName;
-    USHORT          nAspect;
-    BOOL            bLink;
+    sal_uInt16          nAspect;
+    sal_Bool            bLink;
 
     ListBox&        ObjectLB()      { return aLbInsertList; }
     FixedText&      ObjectSource()  { return aFtObjectSource; }
@@ -78,8 +78,8 @@ class SvPasteObjectDialog : public ModalDialog
     DECL_LINK( SelectHdl, ListBox * );
     DECL_LINK( DoubleClickHdl, ListBox * );
     void            SetDefault();
-    USHORT      GetAspect() const { return nAspect; }
-    BOOL        ShouldLink() const { return bLink; }
+    sal_uInt16      GetAspect() const { return nAspect; }
+    sal_Bool        ShouldLink() const { return bLink; }
 
 public:
                 SvPasteObjectDialog( Window* pParent );
@@ -87,7 +87,7 @@ public:
 
     void        Insert( SotFormatStringId nFormat, const String & rFormatName );
     void        SetObjName( const SvGlobalName & rClass, const String & rObjName );
-    ULONG       GetFormat( const TransferableDataHelper& aHelper,
+    sal_uLong       GetFormat( const TransferableDataHelper& aHelper,
                         const DataFlavorExVector* pFormats=0,
                         const TransferableObjectDescriptor* pDesc=0 );
 };
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 701546225bf4..8dedd612d27e 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -61,10 +61,10 @@ class SvxPostItDialog : public SfxModalDialog
 {
 public:
     SvxPostItDialog( Window* pParent, const SfxItemSet& rCoreSet,
-                     BOOL bPrevNext = FALSE, BOOL bRedline = FALSE );
+                     sal_Bool bPrevNext = sal_False, sal_Bool bRedline = sal_False );
     ~SvxPostItDialog();
 
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
     const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
 
     Link                GetPrevHdl() const { return aPrevHdlLink; }
@@ -74,20 +74,20 @@ public:
     void                SetNextHdl( const Link& rLink )
                             { aNextHdlLink = rLink; }
 
-    void                EnableTravel(BOOL bNext, BOOL bPrev);
+    void                EnableTravel(sal_Bool bNext, sal_Bool bPrev);
     inline String       GetNote() { return aEditED.GetText(); }
     inline void         SetNote(const String& rTxt) { aEditED.SetText(rTxt); }
 
     void                ShowLastAuthor(const String& rAuthor, const String& rDate);
-    inline void         DontChangeAuthor()  { aAuthorBtn.Enable(FALSE); }
+    inline void         DontChangeAuthor()  { aAuthorBtn.Enable(sal_False); }
     inline void         HideAuthor()        { aAuthorBtn.Hide(); }
-    inline void         SetReadonlyPostIt(BOOL bDisable)
+    inline void         SetReadonlyPostIt(sal_Bool bDisable)
                             {
                                 aOKBtn.Enable( !bDisable );
                                 aEditED.SetReadOnly( bDisable );
                                 aAuthorBtn.Enable( !bDisable );
                             }
-    inline BOOL         IsOkEnabled() const { return aOKBtn.IsEnabled(); }
+    inline sal_Bool         IsOkEnabled() const { return aOKBtn.IsEnabled(); }
 
 private:
     FixedLine           aPostItFL;
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 8ecdd93a5d2e..579a3756c447 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -75,7 +75,7 @@ class SFTreeListBox : public SvTreeListBox
 {
    friend class SvxScriptOrgDialog;
 private:
-    USHORT          nMode;
+    sal_uInt16          nMode;
     Image m_hdImage;
     Image m_hdImage_hc;
     Image m_libImage;
@@ -109,12 +109,12 @@ public:
 
 
 
-    SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap,
+    SvLBoxEntry * insertEntry(String const & rText, sal_uInt16 nBitmap,
                               SvLBoxEntry * pParent,
                               bool bChildrenOnDemand,
                               std::auto_ptr< SFEntry > aUserData,
                               ::rtl::OUString factoryURL );
-    SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap,
+    SvLBoxEntry * insertEntry(String const & rText, sal_uInt16 nBitmap,
                               SvLBoxEntry * pParent,
                               bool bChildrenOnDemand,
                               std::auto_ptr< SFEntry > aUserData );
@@ -131,7 +131,7 @@ private:
     CancelButton    aCancelButton;
 
 public:
-    InputDialog( Window * pParent, USHORT nMode );
+    InputDialog( Window * pParent, sal_uInt16 nMode );
                 ~InputDialog();
 
     String      GetObjectName() const { return aEdit.GetText(); }
@@ -141,21 +141,21 @@ public:
 class SFEntry
 {
 private:
-    BYTE            nType;
+    sal_uInt8           nType;
     bool            loaded;
         ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > nodes;
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > model;
     SFEntry(){}
 public:
-                    SFEntry( BYTE nT )              { nType = nT; loaded=false; }
-                    SFEntry( BYTE nT,
+                    SFEntry( sal_uInt8 nT )             { nType = nT; loaded=false; }
+                    SFEntry( sal_uInt8 nT,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& entryNodes ,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; }
                     SFEntry( const SFEntry& r ) { nType = r.nType; nodes = r.nodes; loaded = r.loaded; }
     virtual         ~SFEntry() {}
     ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > GetNode() { return nodes ;}
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() { return model ;};
-    BYTE            GetType() const                     { return nType; }
+    sal_uInt8           GetType() const                     { return nType; }
     bool            isLoaded() const                    { return loaded; }
     void            setLoaded()                         { loaded=true; }
 };
@@ -191,7 +191,7 @@ protected:
     DECL_LINK( MacroDoubleClickHdl, SvTreeListBox * );
     DECL_LINK( ScriptSelectHdl, SvTreeListBox * );
     DECL_LINK( ButtonHdl, Button * );
-    BOOL                getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName );
+    sal_Bool                getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName );
     void                CheckButtons(  ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node );
 
     void        createEntry( SvLBoxEntry* pEntry );
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index fec72bfc07b6..6fea545823b0 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -54,7 +54,7 @@ public:
     SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel );
     ~SvxFormatCellsDialog();
 
-    virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 };
 
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 3c01b955a474..c59aa535c0d2 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -50,41 +50,41 @@
 
 struct SvxGroupInfo_Impl
 {
-    USHORT          nKind;
-    USHORT          nOrd;
+    sal_uInt16          nKind;
+    sal_uInt16          nOrd;
     ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >
                     xBrowseNode;
     ::rtl::OUString sURL;
     ::rtl::OUString sHelpText;
-    BOOL            bWasOpened;
+    sal_Bool            bWasOpened;
 
-    SvxGroupInfo_Impl( USHORT n, USHORT nr )
+    SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr )
         :nKind( n )
         ,nOrd( nr )
         ,xBrowseNode()
         ,sURL()
         ,sHelpText()
-        ,bWasOpened(FALSE)
+        ,bWasOpened(sal_False)
     {
     }
 
-    SvxGroupInfo_Impl( USHORT n, USHORT nr, const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& _rxNode )
+    SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& _rxNode )
         :nKind( n )
         ,nOrd( nr )
         ,xBrowseNode( _rxNode )
         ,sURL()
         ,sHelpText()
-        ,bWasOpened(FALSE)
+        ,bWasOpened(sal_False)
     {
     }
 
-    SvxGroupInfo_Impl( USHORT n, USHORT nr, const ::rtl::OUString& _rURL, const ::rtl::OUString& _rHelpText )
+    SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const ::rtl::OUString& _rURL, const ::rtl::OUString& _rHelpText )
         :nKind( n )
         ,nOrd( nr )
         ,xBrowseNode()
         ,sURL( _rURL )
         ,sHelpText( _rHelpText )
-        ,bWasOpened(FALSE)
+        ,bWasOpened(sal_False)
     {
     }
 };
@@ -165,7 +165,7 @@ private:
 
 protected:
     virtual void    RequestingChilds( SvLBoxEntry *pEntry);
-    virtual BOOL    Expand( SvLBoxEntry* pParent );
+    virtual sal_Bool    Expand( SvLBoxEntry* pParent );
     using SvListView::Expand;
 
 public:
@@ -179,7 +179,7 @@ public:
             ~SvxConfigGroupListBox_Impl();
 
     void    Init();
-    void    Open( SvLBoxEntry*, BOOL );
+    void    Open( SvLBoxEntry*, sal_Bool );
     void    ClearAll();
     void    GroupSelected();
 
@@ -203,7 +203,7 @@ class SvxScriptSelectorDialog : public ModelessDialog
     FixedLine                       aDescription;
     FixedText                       aDescriptionText;
 
-    BOOL                            m_bShowSlots;
+    sal_Bool                            m_bShowSlots;
     Link                            m_aAddHdl;
 
     DECL_LINK( ClickHdl, Button * );
@@ -217,7 +217,7 @@ public:
 
     SvxScriptSelectorDialog (
         Window* pParent = NULL,
-        BOOL bShowSlots = FALSE,
+        sal_Bool bShowSlots = sal_False,
         const ::com::sun::star::uno::Reference
             < ::com::sun::star::frame::XFrame >& xFrame = 0
     );
diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx
index 1cf2e91e6511..200a7272d387 100644
--- a/cui/source/inc/srchxtra.hxx
+++ b/cui/source/inc/srchxtra.hxx
@@ -45,7 +45,7 @@ public:
     ~SvxSearchFormatDialog();
 
 protected:
-    virtual void    PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void    PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 private:
     FontList*       pFontList;
@@ -57,7 +57,7 @@ class SvxSearchAttributeDialog : public ModalDialog
 {
 public:
     SvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst,
-                              const USHORT* pWhRanges );
+                              const sal_uInt16* pWhRanges );
 
 private:
     FixedText           aAttrFL;
@@ -92,15 +92,15 @@ private:
 
 public:
     SvxSearchSimilarityDialog(  Window* pParent,
-                                BOOL bRelax,
-                                USHORT nOther,
-                                USHORT nShorter,
-                                USHORT nLonger );
-
-    USHORT  GetOther()      { return (USHORT)aOtherFld.GetValue(); }
-    USHORT  GetShorter()    { return (USHORT)aShorterFld.GetValue(); }
-    USHORT  GetLonger()     { return (USHORT)aLongerFld.GetValue(); }
-    BOOL    IsRelaxed()     { return aRelaxBox.IsChecked(); }
+                                sal_Bool bRelax,
+                                sal_uInt16 nOther,
+                                sal_uInt16 nShorter,
+                                sal_uInt16 nLonger );
+
+    sal_uInt16  GetOther()      { return (sal_uInt16)aOtherFld.GetValue(); }
+    sal_uInt16  GetShorter()    { return (sal_uInt16)aShorterFld.GetValue(); }
+    sal_uInt16  GetLonger()     { return (sal_uInt16)aLongerFld.GetValue(); }
+    sal_Bool    IsRelaxed()     { return aRelaxBox.IsChecked(); }
 };
 
 
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 80e22eff43b5..5aa7703862b2 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -80,12 +80,12 @@ public:
     ~SvxTabulatorTabPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
-    static USHORT*      GetRanges();
+    static sal_uInt16*      GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& rSet );
+    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
-    void                DisableControls( const USHORT nFlag );
+    void                DisableControls( const sal_uInt16 nFlag );
 
 protected:
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 );
@@ -132,10 +132,10 @@ private:
     SvxTabStopItem  aNewTabs;
     long            nDefDist;
     FieldUnit       eDefUnit;
-    BOOL            bCheck;
+    sal_Bool            bCheck;
 
 #ifdef _SVX_TABSTPGE_CXX
-    void            InitTabPos_Impl( USHORT nPos = 0 );
+    void            InitTabPos_Impl( sal_uInt16 nPos = 0 );
     void            SetFillAndTabType_Impl();
 
     // Handler
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 5f58258ea255..3c028d0949d1 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -86,7 +86,7 @@ private:
     DECL_LINK( ClickDirectionHdl_Impl, ImageButton * );
 
     void                SelectDirection( SdrTextAniDirection nValue );
-    USHORT              GetSelectedDirection();
+    sal_uInt16              GetSelectedDirection();
 #endif
 
 public:
@@ -95,9 +95,9 @@ public:
     ~SvxTextAnimationPage();
 
     static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  sal_uInt16*     GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet & );
 
     void         Construct();
@@ -114,7 +114,7 @@ private:
     const SfxItemSet&   rOutAttrs;
     const SdrView*      pView;
 
-    virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 public:
 
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index e8ce016d7d6f..2716abcfb043 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -79,12 +79,12 @@ private:
     const SfxItemSet&   rOutAttrs;
     const SdrView*      pView;
 
-    BOOL                bAutoGrowSizeEnabled;
-    BOOL                bContourEnabled;
-    BOOL                bAutoGrowWidthEnabled;
-    BOOL                bAutoGrowHeightEnabled;
-    BOOL                bWordWrapTextEnabled;
-    BOOL                bFitToSizeEnabled;
+    sal_Bool                bAutoGrowSizeEnabled;
+    sal_Bool                bContourEnabled;
+    sal_Bool                bAutoGrowWidthEnabled;
+    sal_Bool                bAutoGrowHeightEnabled;
+    sal_Bool                bWordWrapTextEnabled;
+    sal_Bool                bFitToSizeEnabled;
 
 
 #ifdef _SVX_TEXTATTR_CXX
@@ -92,8 +92,8 @@ private:
     DECL_LINK( ClickHdl_Impl, void * );
 #endif
 
-    /** Return whether the text direction is from left to right (</TRUE>) or
-        top to bottom (</FALSE>).
+    /** Return whether the text direction is from left to right (</sal_True>) or
+        top to bottom (</sal_False>).
     */
     bool IsTextDirectionLeftToRight (void) const;
 
@@ -103,9 +103,9 @@ public:
     ~SvxTextAttrPage();
 
     static SfxTabPage*  Create( Window*, const SfxItemSet& );
-    static  USHORT*     GetRanges();
+    static  sal_uInt16*     GetRanges();
 
-    virtual BOOL        FillItemSet( SfxItemSet& );
+    virtual sal_Bool        FillItemSet( SfxItemSet& );
     virtual void        Reset( const SfxItemSet & );
 
     virtual void        PointChanged( Window* pWindow, RECT_POINT eRP );
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index d333237f55c7..b2298ddc5028 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -49,27 +49,27 @@ class SdrView;
 
 /** put this into the nAnchorTypes parameter of the SvxTransformTabDialog c'tor
     to disable the size controls */
-const USHORT SVX_OBJ_NORESIZE = 0x0100;
+const sal_uInt16 SVX_OBJ_NORESIZE = 0x0100;
 
 /** put this into the nAnchorTypes parameter of the SvxTransformTabDialog c'tor
     to disable the protect controls */
-const USHORT SVX_OBJ_NOPROTECT = 0x0200;
+const sal_uInt16 SVX_OBJ_NOPROTECT = 0x0200;
 
 class SvxTransformTabDialog : public SfxTabDialog
 {
 private:
     const SdrView*      pView;
 
-    USHORT              nAnchorCtrls;
+    sal_uInt16              nAnchorCtrls;
     Link                aValidateLink;
 
-    virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 public:
 
             SvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr,
                             const SdrView* pView,
-                            USHORT nAnchorTypes = 0);
+                            sal_uInt16 nAnchorTypes = 0);
             ~SvxTransformTabDialog();
 
             //link for the Writer to validate positions
@@ -171,9 +171,9 @@ public:
     SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
 
     static SfxTabPage* Create( Window*, const SfxItemSet& );
-    static USHORT*     GetRanges();
+    static sal_uInt16*     GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -184,7 +184,7 @@ public:
     void         Construct();
     void         SetView( const SdrView* pSdrView ) { mpView = pSdrView; }
 
-//  void         ShowAnchorCtrls(USHORT nAnchorCtrls); // Writer-spezifische Controls anzeigen
+//  void         ShowAnchorCtrls(sal_uInt16 nAnchorCtrls); // Writer-spezifische Controls anzeigen
     virtual void FillUserData();
 
     void        DisableResize();
@@ -236,9 +236,9 @@ public:
          SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
 
     static SfxTabPage* Create( Window*, const SfxItemSet& );
-    static USHORT*     GetRanges();
+    static sal_uInt16*     GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -285,9 +285,9 @@ public:
          SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs  );
 
     static SfxTabPage* Create( Window*, const SfxItemSet& );
-    static USHORT*     GetRanges();
+    static sal_uInt16*     GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 72859aa70945..220968ac4534 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -38,7 +38,7 @@
 
 // static ----------------------------------------------------------------
 
-BOOL            EnableSSO();
+sal_Bool            EnableSSO();
 CreateTabPage   GetSSOCreator( void );
 
 // class OfaOptionsTreeListBox -------------------------------------------
@@ -53,14 +53,14 @@ class OfaOptionsTreeListBox : public SvTreeListBox
     using  SvListView::Collapse;
 
 private:
-    BOOL            bInCollapse;
+    sal_Bool            bInCollapse;
 
 public:
     OfaOptionsTreeListBox(Window* pParent, const ResId& rResId) :
-        SvTreeListBox( pParent, rResId ), bInCollapse(FALSE) {}
+        SvTreeListBox( pParent, rResId ), bInCollapse(sal_False) {}
 
-    virtual BOOL    Collapse( SvLBoxEntry* pParent );
-    BOOL            IsInCollapse()const {return bInCollapse;}
+    virtual sal_Bool    Collapse( SvLBoxEntry* pParent );
+    sal_Bool            IsInCollapse()const {return bInCollapse;}
 };
 
 // struct OrderedEntry ---------------------------------------------------
@@ -154,7 +154,7 @@ typedef ::std::vector< OptionsNode* > VectorOfNodes;
 
 struct LastPageSaver
 {
-    USHORT          m_nLastPageId;
+    sal_uInt16          m_nLastPageId;
     rtl::OUString   m_sLastPageURL_Tools;
     rtl::OUString   m_sLastPageURL_ExtMgr;
 
@@ -202,14 +202,14 @@ private:
     // for the ColorTabPage
     SfxItemSet*     pColorPageItemSet;
     XColorTable*    pColorTab;
-    USHORT          nChangeType;
-    USHORT          nUnknownType;
-    USHORT          nUnknownPos;
-    BOOL            bIsAreaTP;
-
-    BOOL            bForgetSelection;
-    BOOL            bExternBrowserActive;
-    BOOL            bImageResized;
+    sal_uInt16          nChangeType;
+    sal_uInt16          nUnknownType;
+    sal_uInt16          nUnknownPos;
+    sal_Bool            bIsAreaTP;
+
+    sal_Bool            bForgetSelection;
+    sal_Bool            bExternBrowserActive;
+    sal_Bool            bImageResized;
     bool            bInSelectHdl_Impl;
     bool            bIsFromExtensionManager;
 
@@ -223,8 +223,8 @@ private:
 
     static LastPageSaver*   pLastPageSaver;
 
-    SfxItemSet*     CreateItemSet( USHORT nId );
-    void            ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
+    SfxItemSet*     CreateItemSet( sal_uInt16 nId );
+    void            ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
     void            InitTreeAndHandler();
     void            Initialize( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame );
     void            ResizeTreeLB( void );   // resizes dialog so that treelistbox has no horizontal scroll bar
@@ -263,16 +263,16 @@ public:
     OfaTreeOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId );
     ~OfaTreeOptionsDialog();
 
-    OptionsPageInfo*    AddTabPage( USHORT nId, const String& rPageName, USHORT nGroup );
-    USHORT              AddGroup(   const String& rGroupName,  SfxShell* pCreateShell,
-                                    SfxModule* pCreateModule, USHORT nDialogId );
+    OptionsPageInfo*    AddTabPage( sal_uInt16 nId, const String& rPageName, sal_uInt16 nGroup );
+    sal_uInt16              AddGroup(   const String& rGroupName,  SfxShell* pCreateShell,
+                                    SfxModule* pCreateModule, sal_uInt16 nDialogId );
 
     void                ActivateLastSelection();
-    void                ActivatePage( USHORT nResId );
+    void                ActivatePage( sal_uInt16 nResId );
     void                ActivatePage( const String& rPageURL );
     void                ApplyItemSets();
 
-    USHORT              GetColorChanged() const { return nChangeType; }
+    sal_uInt16              GetColorChanged() const { return nChangeType; }
     XColorTable*        GetColorTable() { return pColorTab; }
 
     // helper functions to call the language settings TabPage from the SpellDialog
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index 9a8c9b03da1c..0d814d0e30ac 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -39,9 +39,9 @@
 
 // define ----------------------------------------------------------------
 /* CHINA001
-#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)
 */
 #ifndef _SVX_ZOOM_HXX
 #include "zoom_def.hxx"
@@ -84,7 +84,7 @@ private:
 
     const SfxItemSet&   rSet;
     SfxItemSet*         pOutSet;
-    BOOL                bModified;
+    sal_Bool                bModified;
 
 #ifdef _SVX_ZOOM_CXX
     DECL_LINK( UserHdl, RadioButton* );
@@ -101,11 +101,11 @@ public:
 
     const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
 
-    USHORT              GetFactor() const;
-    void                SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 );
+    sal_uInt16              GetFactor() const;
+    void                SetFactor( sal_uInt16 nNewFactor, sal_uInt16 nBtnId = 0 );
 
-    void                HideButton( USHORT nBtnId );
-    void                SetLimits( USHORT nMin, USHORT nMax );
+    void                HideButton( sal_uInt16 nBtnId );
+    void                SetLimits( sal_uInt16 nMin, sal_uInt16 nMax );
 };
 
 #include <layout/layout-post.hxx>