sw/inc/ndtxt.hxx | 4 ++--
sw/source/core/unocore/unoportenum.cxx | 2 +-
sw/source/filter/ww8/wrtww8.hxx | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit b461c3cb76a7a1f5ad6f8205c1f5203b587ffb9c
Author: Noel <noelgran...@gmail.com>
AuthorDate: Tue Oct 27 08:09:45 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Nov 7 13:18:25 2020 +0100
std::set->o3tl::sorted_vector in SwSoftPageBreakList
Change-Id: I929b2eb5824580d106b2505ea6b2d0a59248a6f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104856
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 7786c6ee8fe4..b222b6568ed2 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -30,7 +30,7 @@
#include "modeltoviewhelper.hxx"
#include <sfx2/Metadatable.hxx>
-
+#include <o3tl/sorted_vector.hxx>
#include <memory>
#include <vector>
#include <set>
@@ -74,7 +74,7 @@ namespace com::sun::star {
namespace text { class XTextContent; }
}
-typedef std::set< sal_Int32 > SwSoftPageBreakList;
+typedef o3tl::sorted_vector< sal_Int32 > SwSoftPageBreakList;
/// SwTextNode is a paragraph in the document model.
class SW_DLLPUBLIC SwTextNode
diff --git a/sw/source/core/unocore/unoportenum.cxx
b/sw/source/core/unocore/unoportenum.cxx
index fbb2a8744d8a..748091ff4252 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -634,7 +634,7 @@ static void lcl_ExportSoftPageBreak(
SwSoftPageBreakList& rBreakArr,
const sal_Int32 nIndex)
{
- for ( auto aIter = rBreakArr.begin(), aEnd = rBreakArr.end(); aIter !=
aEnd; )
+ for ( auto aIter = rBreakArr.begin(); aIter != rBreakArr.end(); )
{
if ( nIndex > *aIter )
{
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 3ad49714fac3..ae1d3dfffd25 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -41,6 +41,7 @@
#include <optional>
#include <o3tl/typed_flags_set.hxx>
+#include <o3tl/sorted_vector.hxx>
#include <cstddef>
#include <memory>
@@ -126,7 +127,7 @@ namespace sw::mark { class IFieldmark; }
namespace com::sun::star::embed { class XEmbeddedObject; }
typedef std::map<const css::embed::XEmbeddedObject*, sal_Int32> WW8OleMap;
-typedef std::set< sal_Int32 > SwSoftPageBreakList;
+typedef o3tl::sorted_vector< sal_Int32 > SwSoftPageBreakList;
#define GRF_MAGIC_1 0x12 // 3 magic bytes for PicLocFc attribute
#define GRF_MAGIC_2 0x34
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
