include/o3tl/sorted_vector.hxx | 1 +
include/svx/fmtools.hxx | 4 ++--
svx/source/form/fmshimp.cxx | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit ce0f8cff3e2e42bf6ff0968c3a6a9efb71ec00d1
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Oct 27 21:10:39 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Oct 28 07:23:39 2020 +0100
std::set->o3tl::sorted_vector in InterfaceBag
Change-Id: I28ecffdcf6c97f9153e62974bf76b972452747eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104901
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/o3tl/sorted_vector.hxx b/include/o3tl/sorted_vector.hxx
index 803a044535e8..508fe61cc03e 100644
--- a/include/o3tl/sorted_vector.hxx
+++ b/include/o3tl/sorted_vector.hxx
@@ -45,6 +45,7 @@ public:
typedef typename std::vector<Value>::const_reverse_iterator
const_reverse_iterator;
typedef typename std::vector<Value>::difference_type difference_type;
typedef typename std::vector<Value>::size_type size_type;
+ typedef Value value_type;
constexpr sorted_vector( std::initializer_list<Value> init )
: m_vector(init)
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index f0fba4e0f32a..90eb6d74c49c 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -30,7 +30,7 @@
#include <rtl/ref.hxx>
#include <cppuhelper/implbase.hxx>
-
+#include <o3tl/sorted_vector.hxx>
#include <set>
namespace com::sun::star::beans { class XPropertySet; }
@@ -168,7 +168,7 @@ bool isRowSetAlive(const css::uno::Reference<
css::uno::XInterface>& _rxRowSet);
// checks if the css::sdbcx::XColumnsSupplier provided by _rxRowSet
supplies any columns
-typedef ::std::set< css::uno::Reference< css::uno::XInterface > > InterfaceBag;
+typedef ::o3tl::sorted_vector< css::uno::Reference< css::uno::XInterface > >
InterfaceBag;
#endif // INCLUDED_SVX_FMTOOLS_HXX
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index d7f25ec073bc..df80dae12a11 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -2603,7 +2603,7 @@ void FmXFormShell::impl_RemoveElement_nothrow_Lock(const
Reference<XInterface>&
}
}
- InterfaceBag::iterator wasSelectedPos = m_aCurrentSelection.find( Element
);
+ auto wasSelectedPos = m_aCurrentSelection.find( Element );
if ( wasSelectedPos != m_aCurrentSelection.end() )
m_aCurrentSelection.erase( wasSelectedPos );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
