sw/source/core/inc/rolbck.hxx | 6 +++---
sw/source/core/undo/rolbck.cxx | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit a598c5ac64fda302d13ff7638fd743a991b2e988
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Sep 12 20:20:00 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Sep 13 08:13:38 2020 +0200
std::set->o3tl::sorted_vector in SwHistorySetAttrSet
Change-Id: I603ddde15c869a66b05c18815326931fbcfd9076
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102537
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 96a8eb58b7d9..3a87e24bd705 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_CORE_INC_ROLBCK_HXX
#include <o3tl/deleter.hxx>
+#include <o3tl/sorted_vector.hxx>
#include <svl/itemset.hxx>
#include <tools/solar.h>
#include <vcl/keycod.hxx>
@@ -29,7 +30,6 @@
#include <memory>
#include <vector>
-#include <set>
namespace sfx2 {
class MetadatableUndo;
@@ -310,7 +310,7 @@ class SwHistorySetAttrSet : public SwHistoryHint
public:
SwHistorySetAttrSet( const SfxItemSet& rSet, sal_uLong nNode,
- const std::set<sal_uInt16> &rSetArr );
+ const o3tl::sorted_vector<sal_uInt16> &rSetArr );
virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override;
};
@@ -411,7 +411,7 @@ public:
class SwRegHistory : public SwClient
{
private:
- std::set<sal_uInt16> m_WhichIdSet;
+ o3tl::sorted_vector<sal_uInt16> m_WhichIdSet;
SwHistory * const m_pHistory;
sal_uLong m_nNodeIndex;
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index aac710f7aee5..8781efef0f05 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -820,7 +820,7 @@ void SwHistoryTextFieldmark::ResetInDoc(SwDoc* pDoc)
}
SwHistorySetAttrSet::SwHistorySetAttrSet( const SfxItemSet& rSet,
- sal_uLong nNodePos, const std::set<sal_uInt16>
&rSetArr )
+ sal_uLong nNodePos, const
o3tl::sorted_vector<sal_uInt16> &rSetArr )
: SwHistoryHint( HSTRY_SETATTRSET )
, m_OldSet( rSet )
, m_ResetArray( 0, 4 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
