CWS gnumake3: pull in cws removetooltypes01

10 files changed, 43 insertions, 43 deletions

diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index c2526cbec18d..1ade2b6289f5 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/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
index c6a26d8c4548..c6a26d8c4548 100755..100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
index 90306435bd4b..90306435bd4b 100755..100644
--- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx
diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx
index 245645dfebf0..ccea420a1cff 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_uLong _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..be6cffc22e8b 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_uLong 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 f5320c2fd20f..0df5bd0fd1b4 100644
--- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx
@@ -41,27 +41,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..f90cb286b4c4 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;
 
@@ -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;