eliminate SvUShorts type

2 files changed, 17 insertions, 31 deletions

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index cb1f2d8fa1d8..2390c005f86d 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -31,12 +31,10 @@
 
 #include <limits.h>
 #include <stdlib.h>
+#include <algorithm>
 #include <vcl/msgbox.hxx>
 #include <unotools/viewoptions.hxx>
 
-#define _SVSTDARR_sal_uInt16S
-#include <svl/svstdarr.hxx>
-
 #include "appdata.hxx"
 #include "sfxtypes.hxx"
 #include <sfx2/minarray.hxx>
@@ -1453,19 +1451,6 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
 
 // -----------------------------------------------------------------------
 
-extern "C" int SAL_CALL TabDlgCmpUS_Impl( const void* p1, const void* p2 )
-
-/*  [Description]
-
-    Comparison function for qsort
-*/
-
-{
-    return *(sal_uInt16*)p1 - *(sal_uInt16*)p2;
-}
-
-// -----------------------------------------------------------------------
-
 void SfxTabDialog::ShowPage( sal_uInt16 nId )
 
 /*  [Description]
@@ -1509,7 +1494,7 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
 
     if ( pRanges )
         return pRanges;
-    SvUShorts aUS( 16, 16 );
+    std::vector<sal_uInt16> aUS;
     sal_uInt16 nCount = pImpl->pData->Count();
 
     sal_uInt16 i;
@@ -1525,26 +1510,27 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
             sal_uInt16 nLen;
             for( nLen = 0; *pIter; ++nLen, ++pIter )
                 ;
-            aUS.Insert( pTmpRanges, nLen, aUS.Count() );
+            aUS.insert( aUS.end(), pTmpRanges, pTmpRanges + nLen );
         }
     }
 
     //! Remove duplicated Ids?
     {
-        nCount = aUS.Count();
+        nCount = aUS.size();
 
         for ( i = 0; i < nCount; ++i )
             aUS[i] = rPool.GetWhich( aUS[i] );
     }
 
     // sort
-    if ( aUS.Count() > 1 )
-        qsort( (void*)aUS.GetData(),
-               aUS.Count(), sizeof(sal_uInt16), TabDlgCmpUS_Impl );
+    if ( aUS.size() > 1 )
+    {
+        std::sort( aUS.begin(), aUS.end() );
+    }
 
-    pRanges = new sal_uInt16[aUS.Count() + 1];
-    memcpy(pRanges, aUS.GetData(), sizeof(sal_uInt16) * aUS.Count());
-    pRanges[aUS.Count()] = 0;
+    pRanges = new sal_uInt16[aUS.size() + 1];
+    std::copy( aUS.begin(), aUS.end(), pRanges );
+    pRanges[aUS.size()] = 0;
     return pRanges;
 }
 
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index df6f09d76322..c9252483c975 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2796,7 +2796,7 @@ void SfxTemplateCatalog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool /*bCheck*/)
     if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
         return;
     sal_uInt16 i;
-    for ( i = 0; i < aFamIds.Count() && aFamIds[i] != nMesId; i++ ) ;
+    for ( i = 0; i < aFamIds.size() && aFamIds[i] != nMesId; i++ ) ;
     aFamList.SelectEntryPos(i);
 }
 
@@ -2807,7 +2807,7 @@ sal_Bool SfxTemplateCatalog_Impl::IsCheckedItem(sal_uInt16 nMesId)
     if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
         return sal_False;
     sal_uInt16 i;
-    for ( i = 0; i < aFamIds.Count() && aFamIds[i] != nMesId; i++ )
+    for ( i = 0; i < aFamIds.size() && aFamIds[i] != nMesId; i++ )
         ;
     return aFamList.IsEntrySelected( String::CreateFromInt32(i) );
 }
@@ -2818,10 +2818,10 @@ sal_Bool SfxTemplateCatalog_Impl::IsCheckedItem(sal_uInt16 nMesId)
 void SfxTemplateCatalog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable )
 {
     if ( !bEnable )
-        for ( sal_uInt16 nPos = aFamIds.Count(); nPos--; )
+        for ( sal_uInt16 nPos = aFamIds.size(); nPos--; )
             if ( aFamIds[ nPos ] == nId )
             {
-                aFamIds.Remove( nPos );
+                aFamIds.erase( aFamIds.begin() + nPos );
                 aFamList.RemoveEntry( nPos );
             }
 }
@@ -2831,13 +2831,13 @@ void SfxTemplateCatalog_Impl::InsertFamilyItem( sal_uInt16 nId, const SfxStyleFa
     if ( nId > SFX_STYLE_FAMILY_PSEUDO || nId < SFX_STYLE_FAMILY_CHAR )
         return;
     aFamList.InsertEntry( pItem->GetText(), 0 );
-    aFamIds.Insert( nId, 0 );
+    aFamIds.insert( aFamIds.begin(), nId );
 }
 
 void SfxTemplateCatalog_Impl::ClearFamilyList()
 {
     aFamList.Clear();
-    aFamIds.Remove( 0, aFamIds.Count() );
+    aFamIds.clear();
 }
 
 void SfxTemplateCatalog_Impl::PrepareDeleteAction()