editeng/source/editeng/impedit3.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 27ae083f7e5fce97c73498698d855cdcaac7737d
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Wed Oct 28 17:27:30 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Oct 28 20:32:11 2020 +0100
std::set->o3tl::sorted_vector in ImpEditEngine
Change-Id: Ia78b986c28e2d8e3655d5c8f56d3cb5cd7a5ee1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104944
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 4ffaeec6afaa..2925183e9cf7 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -67,6 +67,7 @@
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <o3tl/safeint.hxx>
+#include <o3tl/sorted_vector.hxx>
#include <osl/diagnose.h>
#include <comphelper/string.hxx>
#include <comphelper/lok.hxx>
@@ -2390,7 +2391,7 @@ void ImpEditEngine::CreateTextPortions( ParaPortion*
pParaPortion, sal_Int32& rS
ContentNode* pNode = pParaPortion->GetNode();
DBG_ASSERT( pNode->Len(), "CreateTextPortions should not be used for empty
paragraphs!" );
- std::set< sal_Int32 > aPositions;
+ o3tl::sorted_vector< sal_Int32 > aPositions;
aPositions.insert( 0 );
sal_uInt16 nAttr = 0;
@@ -2463,10 +2464,10 @@ void ImpEditEngine::CreateTextPortions( ParaPortion*
pParaPortion, sal_Int32& rS
// A portion may also have been formed by a line break:
aPositions.insert( nPortionStart );
- std::set< sal_Int32 >::iterator nInvPos = aPositions.find( nPortionStart
);
+ auto nInvPos = aPositions.find( nPortionStart );
DBG_ASSERT( (nInvPos != aPositions.end()), "InvPos ?!" );
- std::set< sal_Int32 >::iterator i = nInvPos;
+ auto i = nInvPos;
++i;
while ( i != aPositions.end() )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
