Convert SV_DECL_PTRARR_SORT(SwBlockNames) to o3tl::sorted_vector

Change-Id: I85ceda4df9f495bc514e2f37c73097b268822e1e

sw/source/core/inc/swblocks.hxx

@@ -31,7 +31,7 @@
 #include <tools/string.hxx>
 
 #include <tools/datetime.hxx>
-#include <svl/svarray.hxx>
+#include <o3tl/sorted_vector.hxx>
 
 
 class SwPaM;
@@ -58,11 +58,11 @@ public:
     SwBlockName( const String& rShort, const String& rLong, const String& rPackageName );
 
     // fuer das Einsortieren in das Array
-    int operator==( const SwBlockName& r ) { return aShort == r.aShort; }
-    int operator< ( const SwBlockName& r ) { return aShort <  r.aShort; }
+    bool operator==( const SwBlockName& r ) const { return aShort == r.aShort; }
+    bool operator< ( const SwBlockName& r ) const { return aShort <  r.aShort; }
 };
 
-SV_DECL_PTRARR_SORT( SwBlockNames, SwBlockName*, 10 )
+class SwBlockNames : public o3tl::sorted_vector<SwBlockName*, o3tl::less_ptr_to<SwBlockName> > {};
 
 
 class SwImpBlocks

sw/source/core/swg/SwXMLTextBlocks.cxx

@@ -155,14 +155,17 @@ void SwXMLTextBlocks::AddName( const String& rShort, const String& rLong, sal_Bo
     sal_uInt16 nIdx = GetIndex( rShort );
     SwBlockName* pNew = NULL;
     if( nIdx != (sal_uInt16) -1 )
-        aNames.DeleteAndDestroy( nIdx );
+    {
+        delete aNames[nIdx];
+        aNames.erase( aNames.begin() + nIdx );
+    }
 
     aPackageName = GeneratePackageName( rShort );
     pNew = new SwBlockName( rShort, rLong, aPackageName );
 
     pNew->bIsOnlyTxtFlagInit = sal_True;
     pNew->bIsOnlyTxt = bOnlyTxt;
-    aNames.C40_PTR_INSERT( SwBlockName, pNew );
+    aNames.insert( pNew );
     bInfoChanged = sal_True;
 }
 void SwXMLTextBlocks::AddName( const String& rShort, const String& rLong,
@@ -170,17 +173,20 @@ void SwXMLTextBlocks::AddName( const String& rShort, const String& rLong,
 {
     sal_uInt16 nIdx = GetIndex( rShort );
     if( nIdx != (sal_uInt16) -1 )
-        aNames.DeleteAndDestroy( nIdx );
+    {
+        delete aNames[nIdx];
+        aNames.erase( aNames.begin() + nIdx );
+    }
     SwBlockName* pNew = new SwBlockName( rShort, rLong, rPackageName );
     pNew->bIsOnlyTxtFlagInit = sal_True;
     pNew->bIsOnlyTxt = bOnlyTxt;
-    aNames.C40_PTR_INSERT( SwBlockName, pNew );
+    aNames.insert( pNew );
     bInfoChanged = sal_True;
 }
 
 sal_uLong SwXMLTextBlocks::Delete( sal_uInt16 n )
 {
-    String aPckName (aNames[ n ]->aPackageName);
+    String aPckName (aNames[n]->aPackageName);
     uno::Reference < container::XNameAccess > xAccess( xBlkRoot, uno::UNO_QUERY );
     if ( xAccess.is() &&
             xAccess->hasByName( aPckName ) && xBlkRoot->isStreamElement( aPckName ) )
@@ -206,7 +212,7 @@ sal_uLong SwXMLTextBlocks::Rename( sal_uInt16 nIdx, const String& rNewShort, con
     OSL_ENSURE( xBlkRoot.is(), "No storage set" );
     if(!xBlkRoot.is())
         return 0;
-    rtl::OUString aOldName (aNames[ nIdx ]->aPackageName);
+    rtl::OUString aOldName (aNames[nIdx]->aPackageName);
     aShort = rNewShort;
     aPackageName = GeneratePackageName( aShort );
 

sw/source/core/swg/SwXMLTextBlocks1.cxx

@@ -114,7 +114,7 @@ sal_uLong SwXMLTextBlocks::GetDoc( sal_uInt16 nIdx )
             }
 
             xml::sax::InputSource aParserInput;
-            aParserInput.sSystemId = aNames [ nIdx ] ->aPackageName;
+            aParserInput.sSystemId = aNames[nIdx]->aPackageName;
 
             aParserInput.aInputStream = xStream->getInputStream();
 
@@ -182,9 +182,9 @@ sal_uLong SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
 {
     // set current auto text
 
-    aShort = aNames[ nIdx ]->aShort;
-    aLong = aNames[ nIdx ]->aLong;
-    aPackageName = aNames[ nIdx ]->aPackageName;
+    aShort = aNames[nIdx]->aShort;
+    aLong = aNames[nIdx]->aLong;
+    aPackageName = aNames[nIdx]->aPackageName;
 
     sal_uLong nRet = 0;
 
@@ -603,9 +603,9 @@ sal_uLong SwXMLTextBlocks::SetMacroTable(
     sal_Bool bFileAlreadyOpen )
 {
     // set current autotext
-    aShort = aNames[ nIdx ]->aShort;
-    aLong = aNames[ nIdx ]->aLong;
-    aPackageName = aNames[ nIdx ]->aPackageName;
+    aShort = aNames[nIdx]->aShort;
+    aLong = aNames[nIdx]->aLong;
+    aPackageName = aNames[nIdx]->aPackageName;
 
     // start XML autotext event export
     sal_uLong nRes = 0;

sw/source/core/swg/swblocks.cxx

@@ -47,8 +47,6 @@
 #include <statstr.hrc>
 #include <swerror.h>
 
-SV_IMPL_OP_PTRARR_SORT( SwBlockNames, SwBlockName* );
-
 //////////////////////////////////////////////////////////////////////////
 
 // Hash-Code errechnen (muss nicht eindeutig sein)
@@ -115,7 +113,7 @@ SwImpBlocks::SwImpBlocks( const String& rFile, sal_Bool )
 
 SwImpBlocks::~SwImpBlocks()
 {
-    aNames.DeleteAndDestroy( 0, aNames.Count() );
+    aNames.DeleteAndDestroyAll();
 }
 
 // Loeschen des Inhaltes des Dokuments
@@ -143,7 +141,7 @@ SwPaM* SwImpBlocks::MakePaM()
 
 sal_uInt16 SwImpBlocks::GetCount() const
 {
-    return aNames.Count();
+    return aNames.size();
 }
 
 // Case Insensitive
@@ -151,9 +149,9 @@ sal_uInt16 SwImpBlocks::GetIndex( const String& rShort ) const
 {
     String s( GetAppCharClass().uppercase( rShort ) );
     sal_uInt16 nHash = Hash( s );
-    for( sal_uInt16 i = 0; i < aNames.Count(); i++ )
+    for( sal_uInt16 i = 0; i < aNames.size(); i++ )
     {
-        SwBlockName* pName = aNames[ i ];
+        const SwBlockName* pName = aNames[ i ];
         if( pName->nHashS == nHash
          && pName->aShort == s )
             return i;
@@ -165,9 +163,9 @@ sal_uInt16 SwImpBlocks::GetIndex( const String& rShort ) const
 sal_uInt16 SwImpBlocks::GetLongIndex( const String& rLong ) const
 {
     sal_uInt16 nHash = Hash( rLong );
-    for( sal_uInt16 i = 0; i < aNames.Count(); i++ )
+    for( sal_uInt16 i = 0; i < aNames.size(); i++ )
     {
-        SwBlockName* pName = aNames[ i ];
+        const SwBlockName* pName = aNames[ i ];
         if( pName->nHashL == nHash
          && pName->aLong == rLong )
             return i;
@@ -178,23 +176,23 @@ sal_uInt16 SwImpBlocks::GetLongIndex( const String& rLong ) const
 
 const String& SwImpBlocks::GetShortName( sal_uInt16 n ) const
 {
-    if( n < aNames.Count() )
-        return aNames[ n ]->aShort;
+    if( n < aNames.size() )
+        return aNames[n]->aShort;
     return aEmptyStr;
 }
 
 
 const String& SwImpBlocks::GetLongName( sal_uInt16 n ) const
 {
-    if( n < aNames.Count() )
-        return aNames[ n ]->aLong;
+    if( n < aNames.size() )
+        return aNames[n]->aLong;
     return aEmptyStr;
 }
 
 rtl::OUString SwImpBlocks::GetPackageName( sal_uInt16 n ) const
 {
-    if( n < aNames.Count() )
-        return aNames[ n ]->aPackageName;
+    if( n < aNames.size() )
+        return aNames[n]->aPackageName;
     return rtl::OUString();
 }
 
@@ -203,11 +201,14 @@ void SwImpBlocks::AddName( const String& rShort, const String& rLong,
 {
     sal_uInt16 nIdx = GetIndex( rShort );
     if( nIdx != (sal_uInt16) -1 )
-        aNames.DeleteAndDestroy( nIdx );
+    {
+        delete aNames[nIdx];
+        aNames.erase( aNames.begin() + nIdx );
+    }
     SwBlockName* pNew = new SwBlockName( rShort, rLong, 0L );
     pNew->bIsOnlyTxtFlagInit = sal_True;
     pNew->bIsOnlyTxt = bOnlyTxt;
-    aNames.C40_PTR_INSERT( SwBlockName, pNew );
+    aNames.insert( pNew );
 }
 
 
@@ -341,7 +342,10 @@ sal_Bool SwTextBlocks::Delete( sal_uInt16 n )
         {
             nErr = pImp->Delete( n );
             if( !nErr )
-                pImp->aNames.DeleteAndDestroy( n );
+            {
+                delete pImp->aNames[n];
+                pImp->aNames.erase( pImp->aNames.begin() + n );
+            }
             if( n == pImp->nCur )
                 pImp->nCur = (sal_uInt16) -1;
             if( !nErr )
@@ -383,7 +387,8 @@ sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const String* s, const String* l
             if( !nErr )
             {
                 sal_Bool bOnlyTxt = pImp->aNames[ n ]->bIsOnlyTxt;
-                pImp->aNames.DeleteAndDestroy( n );
+                delete pImp->aNames[n];
+                pImp->aNames.erase( pImp->aNames.begin() + n );
                 pImp->AddName( aNew, aLong, bOnlyTxt );
                 nErr = pImp->MakeBlockList();
             }
@@ -578,7 +583,7 @@ sal_Bool SwTextBlocks::IsOnlyTextBlock( sal_uInt16 nIdx ) const
     sal_Bool bRet = sal_False;
     if( pImp && !pImp->bInPutMuchBlocks )
     {
-        SwBlockName* pBlkNm = pImp->aNames[ nIdx ];
+        SwBlockName* pBlkNm = const_cast<SwBlockName*>( pImp->aNames[ nIdx ] );
         if( !pBlkNm->bIsOnlyTxtFlagInit &&
             !pImp->IsFileChanged() && !pImp->OpenFile( sal_True ) )
         {
@@ -650,5 +655,4 @@ void SwTextBlocks::SetBaseURL( const String& rURL )
         pImp->SetBaseURL(rURL);
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */