std::set<T*> -> o3tl::sorted_vector in sw/

Change-Id: I7b8e221b9e76f98efdbed9ee1c83e32379fde73f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87951
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

14 files changed, 20 insertions, 16 deletions

diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index e223e4fa3dd5..18ae54ccd834 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -26,6 +26,7 @@
 #include <memory>
 #include <vector>
 #include <tools/solar.h>
+#include <o3tl/sorted_vector.hxx>
 
 class SfxPoolItem;
 class SwTextNode;
@@ -359,7 +360,7 @@ public:
 private:
     SwEditShell*                      mpSh;
     std::unique_ptr<SetGetExpFields>  mpSrtLst;
-    std::set<const SwTextField*>      maTmpLst;
+    o3tl::sorted_vector<const SwTextField*> maTmpLst;
 };
 
  /// Implementation in tblcalc.cxx.
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 9633d6b9a4db..3b518626647d 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -744,7 +744,7 @@ css::uno::Sequence< css::uno::Any >
     if ( pCursorShell )
     {
         SwPaM *_pStartCursor = pCursorShell->GetCursor(), *_pStartCursor2 = _pStartCursor;
-        std::set<SwFrame*> vFrameList;
+        o3tl::sorted_vector<SwFrame*> vFrameList;
         do
         {
             if ( _pStartCursor && _pStartCursor->HasMark() )
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index a4014be21762..d58cedfbf919 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-typedef std::set<SwFormat*> SwpFormats;
+typedef o3tl::sorted_vector<SwFormat*> SwpFormats;
 
 // Special case for SvxFontItem: only compare the name
 static bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 768f4772a9c2..759a0633eb84 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -215,7 +215,7 @@ void UpdateFramesForRemoveDeleteRedline(SwDoc & rDoc, SwPaM const& rPam)
     else
     {
         std::vector<SwTextFrame*> frames;
-        std::set<SwRootFrame*> layouts;
+        o3tl::sorted_vector<SwRootFrame*> layouts;
         SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti> aIter(*pStartNode);
         for (SwTextFrame * pFrame = aIter.First(); pFrame; pFrame = aIter.Next())
         {
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 9fa258c5676f..0db3e7820bc3 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -868,7 +868,7 @@ void SwNumRule::SetInvalidRule(bool bFlag)
 {
     if (bFlag)
     {
-        std::set< SwList* > aLists;
+        o3tl::sorted_vector< SwList* > aLists;
         for ( const SwTextNode* pTextNode : maTextNodeList )
         {
             // #i111681# - applying patch from cmc
@@ -980,7 +980,7 @@ void SwNumRule::SetIndentOfFirstListLevelAndChangeOthers( const short nNewIndent
 
 void SwNumRule::Validate()
 {
-    std::set< SwList* > aLists;
+    o3tl::sorted_vector< SwList* > aLists;
     for ( const SwTextNode* pTextNode : maTextNodeList )
     {
         aLists.insert( pTextNode->GetDoc()->getIDocumentListsAccess().getListByName( pTextNode->GetListId() ) );
diff --git a/sw/source/core/fields/fldlst.cxx b/sw/source/core/fields/fldlst.cxx
index 7085894bc22a..15937825fdde 100644
--- a/sw/source/core/fields/fldlst.cxx
+++ b/sw/source/core/fields/fldlst.cxx
@@ -151,7 +151,7 @@ bool SwInputFieldList::BuildSortLst()
                 if( rTextNode.GetNodes().IsDocNodes() )
                 {
                     // not in TempList, thus add to SortList
-                    std::set<const SwTextField*>::iterator it = maTmpLst.find( pTextField );
+                    auto it = maTmpLst.find( pTextField );
                     if( maTmpLst.end() == it )
                     {
                         SwNodeIndex aIdx( rTextNode );
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 484ff172e25d..40179efd79ab 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -72,7 +72,7 @@ enum class SwRemoveResult
 using SwCurrShells = std::set<CurrShell*>;
 
 class SwSectionFrame;
-using SwDestroyList = std::set<SwSectionFrame*>;
+using SwDestroyList = o3tl::sorted_vector<SwSectionFrame*>;
 
 /// The root element of a Writer document layout. Lower frames are expected to
 /// be SwPageFrame instances.
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 545787995612..e3e083127f89 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2594,7 +2594,7 @@ struct SwTableCellInfo::Impl
     const SwTable * m_pTable;
     const SwCellFrame * m_pCellFrame;
     const SwTabFrame * m_pTabFrame;
-    typedef std::set<const SwTableBox *> TableBoxes_t;
+    typedef o3tl::sorted_vector<const SwTableBox *> TableBoxes_t;
     TableBoxes_t m_HandledTableBoxes;
 
 public:
diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx
index afa77e41de10..e7f34081c8ec 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -196,7 +196,7 @@ bool SwpHints::Check(bool bPortionsMerged) const
 
     const SwTextAttr *pLastStart = nullptr;
     const SwTextAttr *pLastEnd = nullptr;
-    std::set<SwTextAttr const*> RsidOnlyAutoFormats;
+    o3tl::sorted_vector<SwTextAttr const*> RsidOnlyAutoFormats;
     if (bPortionsMerged)
     {
         for (size_t i = 0; i < Count(); ++i)
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 2857b2808cca..36bb5f049b5f 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1645,7 +1645,7 @@ SwXText::convertToTextFrame(
     // see if there are frames already anchored to this node
     // we have to work with the SdrObjects, as unique name is not guaranteed in their frame format
     // tdf#115094: do nothing if we have a graphic node
-    std::set<const SdrObject*> aAnchoredObjectsByPtr;
+    o3tl::sorted_vector<const SdrObject*> aAnchoredObjectsByPtr;
     std::set<OUString> aAnchoredObjectsByName;
     for (size_t i = 0; i < m_pImpl->m_pDoc->GetSpzFrameFormats()->size(); ++i)
     {
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 05761c426abe..894b24ba1a36 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -38,6 +38,7 @@
 
 #include <vector>
 #include <o3tl/optional.hxx>
+#include <o3tl/sorted_vector.hxx>
 #include <oox/export/vmlexport.hxx>
 #include <oox/export/drawingml.hxx>
 #include "docxtablestyleexport.hxx"
@@ -847,7 +848,7 @@ private:
     bool m_bPageBreakAfter = false;
 
     std::vector<ww8::Frame> m_aFramesOfParagraph;
-    std::set<const SwFrameFormat*> m_aFloatingTablesOfParagraph;
+    o3tl::sorted_vector<const SwFrameFormat*> m_aFloatingTablesOfParagraph;
     sal_Int32 m_nTextFrameLevel;
 
     // close of hyperlink needed
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index b1ff51aab134..05c146726603 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -37,6 +37,7 @@
 #include <editeng/ulspitem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/fontitem.hxx>
+#include <o3tl/sorted_vector.hxx>
 #include <frmfmt.hxx>
 #include <fmtclds.hxx>
 #include <hfspacingitem.hxx>
@@ -239,7 +240,7 @@ namespace myImplHelpers
     {
     private:
         MapperImpl<C> maHelper;
-        std::set<const C*> maUsedStyles;
+        o3tl::sorted_vector<const C*> maUsedStyles;
         C* MakeNonCollidingStyle(const OUString& rName);
     public:
         typedef std::pair<C*, bool> StyleResult;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 248f3c238148..5dfd181f2135 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1265,7 +1265,7 @@ class WW8_WrPlcAnnotations : public WW8_WrPlcSubDoc  // double Plc for Postits
 private:
     WW8_WrPlcAnnotations(const WW8_WrPlcAnnotations&) = delete;
     WW8_WrPlcAnnotations& operator=(WW8_WrPlcAnnotations const &) = delete;
-    std::set<const SwRedlineData*> maProcessedRedlines;
+    o3tl::sorted_vector<const SwRedlineData*> maProcessedRedlines;
 
     std::map<const OUString, std::pair<WW8_CP, bool>> m_aRangeStartPositions;
 public:
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 4a0b06c553a6..e7d8384f8091 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -52,6 +52,7 @@
 #include <ndtxt.hxx>
 #include <editeng/lrspitem.hxx>
 #include <o3tl/deleter.hxx>
+#include <o3tl/sorted_vector.hxx>
 #include <oox/ole/olehelper.hxx>
 
 #define SW_UD_IMAPDATA      2
@@ -1223,8 +1224,8 @@ private:
     std::shared_ptr<WW8PLCFMan> m_xPlcxMan;
     std::map<short, OUString> m_aLinkStringMap;
 
-    std::set<const SwNode*> m_aTextNodesHavingFirstLineOfstSet; // #i103711#
-    std::set<const SwNode*> m_aTextNodesHavingLeftIndentSet; // #i105414#
+    o3tl::sorted_vector<const SwNode*> m_aTextNodesHavingFirstLineOfstSet; // #i103711#
+    o3tl::sorted_vector<const SwNode*> m_aTextNodesHavingLeftIndentSet; // #i105414#
 
     std::unique_ptr<WW8RStyle> m_xStyles;     // pointer to the style reading class
     SwFormat* m_pCurrentColl;        // collection to be created now