[Libreoffice-commits] core.git: 2 commits - comphelper/source include/basegfx
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Wed Oct 28 06:24:51 UTC 2020
comphelper/source/property/propagg.cxx | 5 ++---
include/basegfx/polygon/b2dpolypolygontools.hxx | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 458ee884c5a57ee1e6dd775b0fbe86a4e3dad5a5
Author: Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Tue Oct 27 21:02:46 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Oct 28 07:24:16 2020 +0100
std::set->o3tl::sorted_vector in PointIndexSet
Change-Id: I223a00b66f6de75eb06969a6d4582200e8229e2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104900
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx
index 9a83ab4549d7..aed3766d75df 100644
--- a/include/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolypolygontools.hxx
@@ -25,7 +25,7 @@
#include <vector>
#include <set>
#include <basegfx/basegfxdllapi.h>
-
+#include <o3tl/sorted_vector.hxx>
namespace com::sun::star::drawing { struct PolyPolygonBezierCoords; }
@@ -118,7 +118,7 @@ namespace basegfx::utils
points in a tools::PolyPolygon by giving the polygon and point index.
Adding points double makes no sense, hence the std::set
*/
- typedef std::set< PointIndex > PointIndexSet;
+ typedef o3tl::sorted_vector< PointIndex > PointIndexSet;
/** Read poly-polygon from SVG.
commit 765a1ac1ff67b3fb2ddd109c9589e4b8e1090695
Author: Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Tue Oct 27 21:11:44 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Oct 28 07:23:55 2020 +0100
std::set->o3tl::sorted_vector in OPropertyArrayAggregationHelper
Change-Id: Iec4935af8946e453b39221dcb982059c806f62a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104902
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index af1092c9748b..576621246207 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -24,10 +24,9 @@
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-
+#include <o3tl/sorted_vector.hxx>
#include <typeinfo>
#include <algorithm>
-#include <set>
#include <unordered_set>
#include <memory>
@@ -250,7 +249,7 @@ namespace internal
{
private:
OPropertySetAggregationHelper& m_rAggregationHelper;
- std::set< sal_Int32 > m_aProperties;
+ o3tl::sorted_vector< sal_Int32 > m_aProperties;
sal_Int32 m_nCurrentlyForwarding;
public:
More information about the Libreoffice-commits
mailing list