CWS gnumake3: pull in cws removetooltypes01

4 files changed, 21 insertions, 21 deletions

diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 4b9e68650180..d4e2d2272c12 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -97,7 +97,7 @@ String DictionaryList::getPropertyTypeName( sal_Int16 nConversionPropertyType )
     if(!m_pPropertyTypeNameListBox || !m_pPropertyTypeNameListBox->GetEntryCount())
         return String();
 
-    USHORT nPos = static_cast<USHORT>( nConversionPropertyType )-1;
+    sal_uInt16 nPos = static_cast<sal_uInt16>( nConversionPropertyType )-1;
     if(nPos<m_pPropertyTypeNameListBox->GetEntryCount())
         return m_pPropertyTypeNameListBox->GetEntry(nPos);
     return m_pPropertyTypeNameListBox->GetEntry(0);
@@ -260,7 +260,7 @@ bool DictionaryList::hasTerm( const rtl::OUString& rTerm ) const
 }
 
 void DictionaryList::addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping
-                              , sal_Int16 nConversionPropertyType, ULONG nPos )
+                              , sal_Int16 nConversionPropertyType, sal_uIntPtr nPos )
 {
     if( hasTerm( rTerm ) )
         return;
@@ -286,9 +286,9 @@ void DictionaryList::deleteEntryOnPos( sal_Int32 nPos  )
     }
 }
 
-ULONG DictionaryList::deleteEntries( const rtl::OUString& rTerm )
+sal_uIntPtr DictionaryList::deleteEntries( const rtl::OUString& rTerm )
 {
-    ULONG nPos = LIST_APPEND;
+    sal_uIntPtr nPos = LIST_APPEND;
     for( sal_Int32 nN=GetRowCount(); nN--; )
     {
         DictionaryEntry* pCurEntry = getEntryOnPos( nN );
@@ -355,7 +355,7 @@ void DictionaryList::Resize()
     m_pHeaderBar->SetSizePixel( aBarSize );
 }
 
-void DictionaryList::sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ )
+void DictionaryList::sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ )
 {
     m_nSortColumnIndex=nSortColumnIndex;
     if( nSortColumnIndex<3 )
@@ -372,7 +372,7 @@ void DictionaryList::sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ )
         GetModel()->SetSortMode(SortNone);
 }
 
-USHORT DictionaryList::getSortColumn() const
+sal_uInt16 DictionaryList::getSortColumn() const
 {
     return m_nSortColumnIndex;
 }
@@ -393,8 +393,8 @@ StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pR
 
     if(pLeftItem != NULL && pRightItem != NULL)
     {
-        USHORT nLeftKind=pLeftItem->IsA();
-        USHORT nRightKind=pRightItem->IsA();
+        sal_uInt16 nLeftKind=pLeftItem->IsA();
+        sal_uInt16 nRightKind=pRightItem->IsA();
 
         if(nRightKind == SV_ITEM_ID_LBOXSTRING &&
             nLeftKind == SV_ITEM_ID_LBOXSTRING )
@@ -412,12 +412,12 @@ StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pR
     return eCompare;
 }
 
-SvLBoxItem* DictionaryList::getItemAtColumn( SvLBoxEntry* pEntry, USHORT nColumn ) const
+SvLBoxItem* DictionaryList::getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const
 {
     SvLBoxItem* pItem = NULL;
     if( pEntry )
     {
-        USHORT nCount = pEntry->ItemCount();
+        sal_uInt16 nCount = pEntry->ItemCount();
         nColumn++;
         if( nTreeFlags & TREEFLAG_CHKBTN )
             nColumn++;
@@ -791,12 +791,12 @@ IMPL_LINK( ChineseDictionaryDialog, ModifyHdl, void*, EMPTYARG )
         {
             if( m_aCB_Reverse.IsChecked() )
             {
-                ULONG nPos = rReverse.deleteEntries( pE->m_aMapping );
+                sal_uIntPtr nPos = rReverse.deleteEntries( pE->m_aMapping );
                 nPos = rReverse.deleteEntries( aMapping );
                 rReverse.addEntry( aMapping, aTerm, nConversionPropertyType, nPos );
             }
 
-            ULONG nPos = rActive.deleteEntries( aTerm );
+            sal_uIntPtr nPos = rActive.deleteEntries( aTerm );
             rActive.addEntry( aTerm, aMapping, nConversionPropertyType, nPos );
         }
     }
@@ -869,7 +869,7 @@ IMPL_LINK( ChineseDictionaryDialog, HeaderBarClick, void*, EMPTYARG )
 {
     if(m_pHeaderBar)
     {
-        USHORT nId = m_pHeaderBar->GetCurItemId();
+        sal_uInt16 nId = m_pHeaderBar->GetCurItemId();
         HeaderBarItemBits nBits = m_pHeaderBar->GetItemBits(nId);
         if( nBits & HIB_CLICKABLE )
         {
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index afe573330fe8..31b77aa32f04 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -94,14 +94,14 @@ public:
     bool hasTerm( const rtl::OUString& rTerm ) const;
 
     void addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping
-            , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, ULONG nPos = LIST_APPEND );
-    ULONG deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted
+            , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, sal_uIntPtr nPos = LIST_APPEND );
+    sal_uIntPtr deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted
     void deleteEntryOnPos( sal_Int32 nPos  );
     DictionaryEntry* getEntryOnPos( sal_Int32 nPos ) const;
     DictionaryEntry* getFirstSelectedEntry() const;
 
-    void sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ );
-    USHORT getSortColumn() const;
+    void sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ );
+    sal_uInt16 getSortColumn() const;
 
     virtual void Resize();
 
@@ -111,7 +111,7 @@ private:
 
     DECL_LINK( CompareHdl, SvSortData* );
     StringCompare ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pRight );
-    SvLBoxItem* getItemAtColumn( SvLBoxEntry* pEntry, USHORT nColumn ) const;
+    SvLBoxItem* getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const;
 
 public:
     ::com::sun::star::uno::Reference<
@@ -123,7 +123,7 @@ private:
 
     std::vector< DictionaryEntry* > m_aToBeDeleted;
 
-    USHORT      m_nSortColumnIndex;
+    sal_uInt16      m_nSortColumnIndex;
 };
 
 class ChineseDictionaryDialog : public ModalDialog
diff --git a/svx/source/unodialogs/textconversiondlgs/resid.cxx b/svx/source/unodialogs/textconversiondlgs/resid.cxx
index d4779aad151f..43a5acc043f6 100644
--- a/svx/source/unodialogs/textconversiondlgs/resid.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/resid.cxx
@@ -42,7 +42,7 @@ static ResMgr* getTextConversionResMgr()
         pMgr = ResMgr::CreateResMgr( "textconversiondlgs" );
     return pMgr;
 }
-TextConversionDlgs_ResId::TextConversionDlgs_ResId(USHORT nId)
+TextConversionDlgs_ResId::TextConversionDlgs_ResId(sal_uInt16 nId)
          : ResId( nId, *getTextConversionResMgr() )
 {
 }
diff --git a/svx/source/unodialogs/textconversiondlgs/resid.hxx b/svx/source/unodialogs/textconversiondlgs/resid.hxx
index ed474b59c32d..d2891870a649 100644
--- a/svx/source/unodialogs/textconversiondlgs/resid.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/resid.hxx
@@ -41,7 +41,7 @@ namespace textconversiondlgs
 class TextConversionDlgs_ResId : public ResId
 {
  public:
-    TextConversionDlgs_ResId(USHORT nId);
+    TextConversionDlgs_ResId(sal_uInt16 nId);
 };
 
 //.............................................................................