toolkit/inc/helper/unopropertyarrayhelper.hxx | 4 ++-- toolkit/source/controls/unocontrolmodel.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 1977138acba04a7b91d73a3041606b2387e72e70 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Tue Oct 27 21:12:49 2020 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Wed Oct 28 07:25:01 2020 +0100 std::set->o3tl::sorted_vector in toolkit Change-Id: I1ef897d38c26d2875432d279fdd50d2e073ad2a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104903 Tested-by: Jenkins Tested-by: Noel Grandin <noel.gran...@collabora.co.uk> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/toolkit/inc/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx index 6036901ac842..29c87099a83b 100644 --- a/toolkit/inc/helper/unopropertyarrayhelper.hxx +++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx @@ -24,13 +24,13 @@ #include <cppuhelper/propshlp.hxx> #include <vector> -#include <set> +#include <o3tl/sorted_vector.hxx> class UnoPropertyArrayHelper final : public ::cppu::IPropertyArrayHelper { - std::set<sal_Int32> maIDs; + o3tl::sorted_vector<sal_Int32> maIDs; bool ImplHasProperty( sal_uInt16 nPropId ) const; diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 5725cd16501a..80ebb041299c 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -46,7 +46,7 @@ #include <vcl/unohelp.hxx> #include <memory> -#include <set> +#include <o3tl/sorted_vector.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -546,7 +546,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt OutStream->writeShort( UNOCONTROL_STREAMVERSION ); - std::set<sal_uInt16> aProps; + o3tl::sorted_vector<sal_uInt16> aProps; for (const auto& rData : maData) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits