removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework

16 files changed, 80 insertions, 88 deletions

diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
index dc43e500dadd..b3728189948c 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx
@@ -190,7 +190,7 @@ public:
     // XAccessibleComponent ---------------------------------------------------
 
     /** @return
-        <TRUE/>, if the point lies within the bounding box of this object. */
+        <sal_True/>, if the point lies within the bounding box of this object. */
     virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint )
         throw ( ::com::sun::star::uno::RuntimeException );
 
@@ -212,15 +212,15 @@ public:
     virtual ::com::sun::star::awt::Size SAL_CALL getSize()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the object is showing. */
+    /** @return  <sal_True/>, if the object is showing. */
     virtual sal_Bool SAL_CALL isShowing()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the object is visible. */
+    /** @return  <sal_True/>, if the object is visible. */
     virtual sal_Bool SAL_CALL isVisible()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the object can accept the focus. */
+    /** @return  <sal_True/>, if the object can accept the focus. */
     virtual sal_Bool SAL_CALL isFocusTraversable()
         throw ( ::com::sun::star::uno::RuntimeException );
 
@@ -302,7 +302,7 @@ public:
             const ::com::sun::star::uno::Any& rNewValue,
 
     const ::com::sun::star::uno::Any& rOldValue );
-    /** @return  <TRUE/>, if the object is not disposed or disposing. */
+    /** @return  <sal_True/>, if the object is not disposed or disposing. */
     sal_Bool isAlive() const;
 
 protected:
@@ -312,7 +312,7 @@ protected:
         its parent accessible window. Derived classes may implement different
         behaviour.
         @attention  This method requires locked mutex's and a living object.
-        @return  <TRUE/>, if the object is really showing. */
+        @return  <sal_True/>, if the object is really showing. */
     virtual sal_Bool implIsShowing();
 
     /** Derived classes return the bounding box relative to the parent window.
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index 5ab160535aa0..599a98b54012 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -48,8 +48,8 @@ namespace accessibility
     {
     private:
         TriState m_eState;
-        BOOL m_bEnabled;
-        BOOL m_bIsTriState;
+        sal_Bool m_bEnabled;
+        sal_Bool m_bIsTriState;
 
     protected:
         virtual ~AccessibleCheckBoxCell() {}
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
index ac0b2761eb1f..28e693e10c79 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx
@@ -131,12 +131,12 @@ public:
     getSelectedAccessibleColumns()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified row is completely selected. */
+    /** @return  <sal_True/>, if the specified row is completely selected. */
     virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified column is completely selected. */
+    /** @return  <sal_True/>, if the specified column is completely selected. */
     virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
@@ -149,7 +149,7 @@ public:
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified cell is selected. */
+    /** @return  <sal_True/>, if the specified cell is selected. */
     virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
@@ -161,7 +161,7 @@ public:
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified child (row/column) is selected. */
+    /** @return  <sal_True/>, if the specified child (row/column) is selected. */
     virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
@@ -232,9 +232,9 @@ protected:
 
     // internal helper methods ------------------------------------------------
 
-    /** @return  <TRUE/>, if the objects is a header bar for rows. */
+    /** @return  <sal_True/>, if the objects is a header bar for rows. */
     inline sal_Bool isRowBar() const;
-    /** @return  <TRUE/>, if the objects is a header bar for columns. */
+    /** @return  <sal_True/>, if the objects is a header bar for columns. */
     inline sal_Bool isColumnBar() const;
 
     /** Returns the specified row or column. Uses one of the parameters,
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
index afb345487239..e9474f703044 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx
@@ -116,12 +116,12 @@ public:
     getSelectedAccessibleColumns()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified row is completely selected. */
+    /** @return  <sal_True/>, if the specified row is completely selected. */
     virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified column is completely selected. */
+    /** @return  <sal_True/>, if the specified column is completely selected. */
     virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
@@ -134,7 +134,7 @@ public:
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified cell is selected. */
+    /** @return  <sal_True/>, if the specified cell is selected. */
     virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
index fa6ce94cfc7f..f4efb30466ae 100644
--- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx
@@ -191,7 +191,7 @@ protected:
 
     // internal helper methods ------------------------------------------------
 
-    /** @return  <TRUE/>, if first BrowseBox column is the "handle column". */
+    /** @return  <sal_True/>, if first BrowseBox column is the "handle column". */
     sal_Bool implHasHandleColumn() const;
 
     /** @attention  This method requires locked mutex's and a living object.
@@ -217,19 +217,19 @@ protected:
     sal_Int32 implGetChildIndex( sal_Int32 nRow, sal_Int32 nColumn ) const;
 
     /** @attention  This method requires locked mutex's and a living object.
-        @return  <TRUE/>, if the specified row is selected. */
+        @return  <sal_True/>, if the specified row is selected. */
     sal_Bool implIsRowSelected( sal_Int32 nRow ) const;
     /** @attention  This method requires locked mutex's and a living object.
-        @return  <TRUE/>, if the specified column is selected. */
+        @return  <sal_True/>, if the specified column is selected. */
     sal_Bool implIsColumnSelected( sal_Int32 nColumn ) const;
 
     /** Selects/deselects a row (tries to expand selection).
         @attention  This method requires locked mutex's and a living object.
-        @param bSelect  <TRUE/> = select, <FALSE/> = deselect */
+        @param bSelect  <sal_True/> = select, <sal_False/> = deselect */
     void implSelectRow( sal_Int32 nRow, sal_Bool bSelect );
     /** Selects/deselects a column (tries to expand selection).
         @attention  This method requires locked mutex's and a living object.
-        @param bSelect  <TRUE/> = select, <FALSE/> = deselect */
+        @param bSelect  <sal_True/> = select, <sal_False/> = deselect */
     void implSelectColumn( sal_Int32 nColumnPos, sal_Bool bSelect );
 
     /** @attention  This method requires locked mutex's and a living object.
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index c6a26d8c4548..53e7eec6fde7 100755..100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
@@ -166,7 +166,7 @@ public:
     // XAccessibleComponent ---------------------------------------------------
 
     /** @return
-        <TRUE/>, if the point lies within the bounding box of this object. */
+        <sal_True/>, if the point lies within the bounding box of this object. */
     virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint )
         throw ( ::com::sun::star::uno::RuntimeException );
 
@@ -188,15 +188,15 @@ public:
     virtual ::com::sun::star::awt::Size SAL_CALL getSize()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the object is showing. */
+    /** @return  <sal_True/>, if the object is showing. */
     virtual sal_Bool SAL_CALL isShowing()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the object is visible. */
+    /** @return  <sal_True/>, if the object is visible. */
     virtual sal_Bool SAL_CALL isVisible()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the object can accept the focus. */
+    /** @return  <sal_True/>, if the object can accept the focus. */
     virtual sal_Bool SAL_CALL isFocusTraversable()
         throw ( ::com::sun::star::uno::RuntimeException );
 
@@ -269,7 +269,7 @@ public:
             const ::com::sun::star::uno::Any& rNewValue,
 
     const ::com::sun::star::uno::Any& rOldValue );
-    /** @return  <TRUE/>, if the object is not disposed or disposing. */
+    /** @return  <sal_True/>, if the object is not disposed or disposing. */
     sal_Bool isAlive() const;
 
 protected:
@@ -279,7 +279,7 @@ protected:
         its parent accessible window. Derived classes may implement different
         behaviour.
         @attention  This method requires locked mutex's and a living object.
-        @return  <TRUE/>, if the object is really showing. */
+        @return  <sal_True/>, if the object is really showing. */
     virtual sal_Bool implIsShowing();
 
     /** Derived classes return the bounding box relative to the parent window.
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
index 90306435bd4b..538c1a224acd 100755..100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
@@ -125,12 +125,12 @@ public:
     getSelectedAccessibleColumns()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified row is completely selected. */
+    /** @return  <sal_True/>, if the specified row is completely selected. */
     virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified column is completely selected. */
+    /** @return  <sal_True/>, if the specified column is completely selected. */
     virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
@@ -143,7 +143,7 @@ public:
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified cell is selected. */
+    /** @return  <sal_True/>, if the specified cell is selected. */
     virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
@@ -190,9 +190,9 @@ protected:
 
     // internal helper methods ------------------------------------------------
 
-    /** @return  <TRUE/>, if the objects is a header bar for rows. */
+    /** @return  <sal_True/>, if the objects is a header bar for rows. */
     inline sal_Bool isRowBar() const;
-    /** @return  <TRUE/>, if the objects is a header bar for columns. */
+    /** @return  <sal_True/>, if the objects is a header bar for columns. */
     inline sal_Bool isColumnBar() const;
 };
 
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
index 8058594d2938..6315b1027695 100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx
@@ -120,12 +120,12 @@ public:
     getSelectedAccessibleColumns()
         throw ( ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified row is completely selected. */
+    /** @return  <sal_True/>, if the specified row is completely selected. */
     virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified column is completely selected. */
+    /** @return  <sal_True/>, if the specified column is completely selected. */
     virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
@@ -138,7 +138,7 @@ public:
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified cell is selected. */
+    /** @return  <sal_True/>, if the specified cell is selected. */
     virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
@@ -150,7 +150,7 @@ public:
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
 
-    /** @return  <TRUE/>, if the specified child (row/column) is selected. */
+    /** @return  <sal_True/>, if the specified child (row/column) is selected. */
     virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex )
         throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
                 ::com::sun::star::uno::RuntimeException );
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
index 28d9cfb919f1..bee42d85e2a2 100755..100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx
@@ -174,14 +174,6 @@ protected:
     // internal helper methods ------------------------------------------------
 
     /** @attention  This method requires locked mutex's and a living object.
-        @param nColumn
-            the position of the column in the Accessible world
-        @return
-            the position of the column in VCL the Accessible world
-    */
-    sal_uInt16 implToVCLColumnPos( sal_Int32 nColumn ) const;
-
-    /** @attention  This method requires locked mutex's and a living object.
         @return  The number of cells of the table. */
     sal_Int32 implGetChildCount() const;
 
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
index 245645dfebf0..06dbd20f665a 100644
--- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
@@ -128,7 +128,7 @@ namespace accessibility
                 is our parent accessible object
         */
         AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
-                                       ULONG _nPos,
+                                       sal_uIntPtr _nPos,
                                        const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent );
 
         // XTypeProvider
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index d4b3be6c5bf3..f8da1321586a 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -624,7 +624,7 @@ private:
 
     // Must be called with both the external (Solar) and internal mutex
     // locked, and after init has been called:
-    void changeParagraphText(::ULONG nNumber, ::USHORT nBegin, ::USHORT nEnd,
+    void changeParagraphText(::sal_uIntPtr nNumber, ::sal_uInt16 nBegin, ::sal_uInt16 nEnd,
                              bool bCut, bool bPaste,
                              ::rtl::OUString const & rText);
 
diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
index 847896a14588..2c0693a1194f 100644
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@ -42,27 +42,27 @@ namespace accessibility
     class SAL_NO_VTABLE IComboListBoxHelper
     {
     public:
-        virtual String          GetEntry( USHORT nPos ) const = 0;
+        virtual String          GetEntry( sal_uInt16 nPos ) const = 0;
         virtual Rectangle       GetDropDownPosSizePixel( ) const = 0;
-        virtual Rectangle       GetBoundingRectangle( USHORT nItem ) const = 0;
+        virtual Rectangle       GetBoundingRectangle( sal_uInt16 nItem ) const = 0;
         virtual Rectangle       GetWindowExtentsRelative( Window* pRelativeWindow ) = 0;
-        virtual BOOL            IsActive() const = 0;
-        virtual BOOL            IsEntryVisible( USHORT nPos ) const = 0;
-        virtual USHORT          GetDisplayLineCount() const = 0;
-        virtual void            GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const = 0;
+        virtual sal_Bool            IsActive() const = 0;
+        virtual sal_Bool            IsEntryVisible( sal_uInt16 nPos ) const = 0;
+        virtual sal_uInt16          GetDisplayLineCount() const = 0;
+        virtual void            GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const = 0;
         virtual WinBits         GetStyle() const = 0;
-        virtual BOOL            IsMultiSelectionEnabled() const = 0;
-        virtual USHORT          GetTopEntry() const = 0;
-        virtual BOOL            IsEntryPosSelected( USHORT nPos ) const = 0;
-        virtual USHORT          GetEntryCount() const = 0;
+        virtual sal_Bool            IsMultiSelectionEnabled() const = 0;
+        virtual sal_uInt16          GetTopEntry() const = 0;
+        virtual sal_Bool            IsEntryPosSelected( sal_uInt16 nPos ) const = 0;
+        virtual sal_uInt16          GetEntryCount() const = 0;
         virtual void            Select() = 0;
-        virtual void            SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE ) = 0;
-        virtual USHORT          GetSelectEntryCount() const = 0;
+        virtual void            SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect = sal_True ) = 0;
+        virtual sal_uInt16          GetSelectEntryCount() const = 0;
         virtual void            SetNoSelection() = 0;
-        virtual USHORT          GetSelectEntryPos( USHORT nSelIndex = 0 ) const = 0;
-        virtual BOOL            IsInDropDown() const = 0;
+        virtual sal_uInt16          GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const = 0;
+        virtual sal_Bool            IsInDropDown() const = 0;
         virtual Rectangle       GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0;
-        virtual long            GetIndexForPoint( const Point& rPoint, USHORT& nPos ) const = 0;
+        virtual long            GetIndexForPoint( const Point& rPoint, sal_uInt16& nPos ) const = 0;
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >
                                 GetClipboard() = 0;
     };
diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx b/accessibility/inc/accessibility/helper/listboxhelper.hxx
index e0a1fed7f8e8..b1edb36893f0 100644
--- a/accessibility/inc/accessibility/helper/listboxhelper.hxx
+++ b/accessibility/inc/accessibility/helper/listboxhelper.hxx
@@ -54,7 +54,7 @@ public:
         m_aComboListBox( _pListBox ){}
 
     // -----------------------------------------------------------------------------
-    virtual String          GetEntry( USHORT nPos ) const
+    virtual String          GetEntry( sal_uInt16 nPos ) const
     {
         return m_aComboListBox.GetEntry( nPos );
     }
@@ -67,7 +67,7 @@ public:
         return aRet;
     }
     // -----------------------------------------------------------------------------
-    virtual Rectangle       GetBoundingRectangle( USHORT nItem ) const
+    virtual Rectangle       GetBoundingRectangle( sal_uInt16 nItem ) const
     {
         Rectangle aRect;
         if ( m_aComboListBox.IsInDropDown() && IsEntryVisible( nItem ) )
@@ -89,24 +89,24 @@ public:
         return m_aComboListBox.GetWindowExtentsRelative( pRelativeWindow );
     }
     // -----------------------------------------------------------------------------
-    virtual BOOL            IsActive() const
+    virtual sal_Bool            IsActive() const
     {
         return m_aComboListBox.IsActive();
     }
     // -----------------------------------------------------------------------------
-    virtual BOOL            IsEntryVisible( USHORT nPos ) const
+    virtual sal_Bool            IsEntryVisible( sal_uInt16 nPos ) const
     {
-        USHORT nTopEntry = m_aComboListBox.GetTopEntry();
-        USHORT nLines = m_aComboListBox.GetDisplayLineCount();
+        sal_uInt16 nTopEntry = m_aComboListBox.GetTopEntry();
+        sal_uInt16 nLines = m_aComboListBox.GetDisplayLineCount();
         return ( nPos >= nTopEntry && nPos < ( nTopEntry + nLines ) );
     }
     // -----------------------------------------------------------------------------
-    virtual USHORT          GetDisplayLineCount() const
+    virtual sal_uInt16          GetDisplayLineCount() const
     {
         return m_aComboListBox.GetDisplayLineCount();
     }
     // -----------------------------------------------------------------------------
-    virtual void            GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const
+    virtual void            GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const
     {
         m_aComboListBox.GetMaxVisColumnsAndLines(rnCols,rnLines);
     }
@@ -116,22 +116,22 @@ public:
         return m_aComboListBox.GetStyle();
     }
     // -----------------------------------------------------------------------------
-    virtual BOOL            IsMultiSelectionEnabled() const
+    virtual sal_Bool            IsMultiSelectionEnabled() const
     {
         return m_aComboListBox.IsMultiSelectionEnabled();
     }
     // -----------------------------------------------------------------------------
-    virtual USHORT          GetTopEntry() const
+    virtual sal_uInt16          GetTopEntry() const
     {
         return m_aComboListBox.GetTopEntry();
     }
     // -----------------------------------------------------------------------------
-    virtual BOOL            IsEntryPosSelected( USHORT nPos ) const
+    virtual sal_Bool            IsEntryPosSelected( sal_uInt16 nPos ) const
     {
         return m_aComboListBox.IsEntryPosSelected(nPos);
     }
     // -----------------------------------------------------------------------------
-    virtual USHORT          GetEntryCount() const
+    virtual sal_uInt16          GetEntryCount() const
     {
         return m_aComboListBox.GetEntryCount();
     }
@@ -141,12 +141,12 @@ public:
         m_aComboListBox.Select();
     }
     // -----------------------------------------------------------------------------
-    virtual void    SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE )
+    virtual void    SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect = sal_True )
     {
         m_aComboListBox.SelectEntryPos(nPos,bSelect);
     }
     // -----------------------------------------------------------------------------
-    virtual USHORT          GetSelectEntryCount() const
+    virtual sal_uInt16          GetSelectEntryCount() const
     {
         return m_aComboListBox.GetSelectEntryCount();
     }
@@ -156,12 +156,12 @@ public:
         m_aComboListBox.SetNoSelection();
     }
     // -----------------------------------------------------------------------------
-    virtual USHORT          GetSelectEntryPos( USHORT nSelIndex = 0 ) const
+    virtual sal_uInt16          GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const
     {
         return m_aComboListBox.GetSelectEntryPos(nSelIndex);
     }
     // -----------------------------------------------------------------------------
-    virtual BOOL            IsInDropDown() const
+    virtual sal_Bool            IsInDropDown() const
     {
         return m_aComboListBox.IsInDropDown();
     }
@@ -179,7 +179,7 @@ public:
         return aRect;
     }
     // -----------------------------------------------------------------------------
-    long GetIndexForPoint( const Point& rPoint, USHORT& nPos ) const
+    long GetIndexForPoint( const Point& rPoint, sal_uInt16& nPos ) const
     {
         return m_aComboListBox.GetIndexForPoint( rPoint, nPos );
     }
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
index dfebec17b4e9..ecd557798b4d 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx
@@ -156,7 +156,7 @@ protected:
     /// Index in parent.  This is settable from the outside.
     sal_Int32   m_nIndexInParent;
     sal_Int32   m_nLastTopEntry;
-    USHORT      m_nLastSelectedPos;
+    sal_uInt16      m_nLastSelectedPos;
     bool        m_bDisableProcessEvent;
     bool        m_bVisible;
 
@@ -189,8 +189,8 @@ protected:
     /** Call this method when the item list has been changed, i.e. items
         have been deleted or inserted.
         @param bItemInserted
-            Indicate whether items have been inserted (<TRUE/>) or removed
-            (<FALSE/>).
+            Indicate whether items have been inserted (<sal_True/>) or removed
+            (<sal_False/>).
         @param nIndex
             Index of the new or removed item.  A value of -1 indicates that
             the whole list has been cleared.
@@ -215,8 +215,8 @@ private:
     void adjustEntriesIndexInParent(ListItems::iterator& _aBegin,::std::mem_fun_t<bool,VCLXAccessibleListItem>& _rMemFun);
     void UpdateEntryRange_Impl (void);
 protected:
-    void UpdateSelection_Impl (USHORT nPos = 0);
-    BOOL checkEntrySelected(USHORT _nPos,
+    void UpdateSelection_Impl (sal_uInt16 nPos = 0);
+    sal_Bool checkEntrySelected(sal_uInt16 _nPos,
                             ::com::sun::star::uno::Any& _rNewValue,
                             ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxNewAcc);
 private:
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
index 9a266d78bb05..829a4337e878 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
@@ -95,15 +95,15 @@ protected:
 
 private:
     sal_Int32   m_nLastTopEntry;
-    USHORT      m_nLastSelectedPos;
+    sal_uInt16      m_nLastSelectedPos;
     bool        m_bDisableProcessEvent;
 
     void UpdateEntryRange_Impl (void);
     using VCLXAccessibleList::UpdateSelection_Impl;
     void UpdateSelection_Impl (void);
     using VCLXAccessibleList::checkEntrySelected;
-    BOOL checkEntrySelected(ListBox* _pListBox,
-                            USHORT _nPos,
+    sal_Bool checkEntrySelected(ListBox* _pListBox,
+                            sal_uInt16 _nPos,
                             ::com::sun::star::uno::Any& _rNewValue,
                             ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxNewAcc);
 };
diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
index 4e2073a47a89..2869e240227d 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx
@@ -65,7 +65,7 @@ private:
     VCLExternalSolarLock*   m_pExternalLock;
     sal_Int32               m_nIndexInParent;
     sal_Int16               m_nRole;
-    USHORT                  m_nItemId;
+    sal_uInt16                  m_nItemId;
     sal_Bool                m_bHasFocus;
     sal_Bool                m_bIsChecked;
     bool                    m_bIndeterminate;