[Libreoffice-commits] core.git: xmloff/source

[Noel Grandin (via logerrit)]

 xmloff/source/forms/layerexport.cxx |    2 +-
 xmloff/source/forms/layerexport.hxx |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 5678db6ff2d8d1e1bc73972b8af8e6d063d499ad
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sun Aug 1 11:00:18 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Aug 1 20:06:21 2021 +0200

    o3tl::sorted_vector is better for small sets of pointers
    
    Change-Id: Ice284159b1666d930903eb53315e8a3c777c2a16
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119815
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index e87d8fae9fc3..c6d9edf17378 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -717,7 +717,7 @@ namespace xmloff
     {
         Reference< XPropertySet > xProps( _rxControl, UNO_QUERY );
         OSL_ENSURE( xProps.is(), "OFormLayerXMLExport_Impl::excludeFromExport: invalid control model!" );
-        ::std::pair< PropertySetBag::iterator, bool > aPos =
+        ::std::pair< PropertySetBag::const_iterator, bool > aPos =
               m_aIgnoreList.insert( xProps );
         OSL_ENSURE( aPos.second, "OFormLayerXMLExport_Impl::excludeFromExport: element already exists in the ignore list!" );
     }
diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx
index 3fabafb57b5a..39e6b5667c0f 100644
--- a/xmloff/source/forms/layerexport.hxx
+++ b/xmloff/source/forms/layerexport.hxx
@@ -22,7 +22,6 @@
 #include <sal/config.h>
 
 #include <map>
-#include <set>
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
@@ -31,6 +30,7 @@
 #include <com/sun/star/awt/XControlModel.hpp>
 #include "callbacks.hxx"
 #include <rtl/ref.hxx>
+#include <o3tl/sorted_vector.hxx>
 
 class SvXMLExport;
 class SvXMLNumFmtExport;
@@ -40,8 +40,7 @@ class SvXMLExportPropertyMapper;
 namespace xmloff
 {
 
-    typedef ::std::set  <   css::uno::Reference< css::beans::XPropertySet >
-                        >   PropertySetBag;
+    typedef o3tl::sorted_vector< css::uno::Reference< css::beans::XPropertySet > > PropertySetBag;
 
     // maps objects (property sets) to strings, e.g. control ids.
     typedef ::std::map  <   css::uno::Reference< css::beans::XPropertySet >