[Libreoffice-commits] core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/core/layout/laycache.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 636c1df23a7f459a1ff52d45fdeafdcbbe00b8a0
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Sep 12 15:33:22 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Sep 12 17:13:17 2020 +0200

    std::set->o3tl::sorted_vector in CheckFlyCache_
    
    Change-Id: If4209f165912f5026d8bb2c311314dba8aaba1ff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102518
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index df4cfef9e0ed..f64c3251a24b 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -990,7 +990,7 @@ void SwLayHelper::CheckFlyCache_( SwPageFrame* pPage )
         ++mnFlyIdx;
 
     // sort cached objects on this page by ordnum
-    std::set< const SwFlyCache*, FlyCacheCompare > aFlyCacheSet;
+    o3tl::sorted_vector< const SwFlyCache*, FlyCacheCompare > aFlyCacheSet;
     size_t nIdx = mnFlyIdx;
 
     SwFlyCache* pFlyC;
@@ -1002,7 +1002,7 @@ void SwLayHelper::CheckFlyCache_( SwPageFrame* pPage )
     }
 
     // sort objects on this page by ordnum
-    std::set< const SdrObject*, SdrObjectCompare > aFlySet;
+    o3tl::sorted_vector< const SdrObject*, SdrObjectCompare > aFlySet;
     for (SwAnchoredObject* pAnchoredObj : rObjs)
     {
         if (SwFlyFrame *pFly = dynamic_cast<SwFlyFrame*>(pAnchoredObj))  // a text frame?
@@ -1022,8 +1022,7 @@ void SwLayHelper::CheckFlyCache_( SwPageFrame* pPage )
     if ( aFlyCacheSet.size() != aFlySet.size() )
         return;
 
-    std::set< const SdrObject*, SdrObjectCompare >::iterator aFlySetIt =
-            aFlySet.begin();
+    auto aFlySetIt = aFlySet.begin();
 
     for ( const SwFlyCache* pFlyCache : aFlyCacheSet )
     {