[Libreoffice-commits] core.git: comphelper/source include/comphelper

[Stephan Bergmann (via logerrit)]

 comphelper/source/property/propagg.cxx |    6 ++++--
 include/comphelper/propagg.hxx         |    2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8e02f081ab405fe0a51614a37acd32e743c01056
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Apr 12 17:46:06 2022 +0200
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Apr 12 21:03:10 2022 +0200

    Remove need for OPropertyAccessor default ctor
    
    Change-Id: Ia5ae4e28aa880600ce80bd284cde5183c49e4b40
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132929
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/comphelper/source/property/propagg.cxx 
b/comphelper/source/property/propagg.cxx
index a93c82c98fae..d864450898d6 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -88,7 +88,8 @@ 
OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
         auto &prop = m_aProperties[ nMPLoop ];
         if ( aDelegatorProps.find( prop.Name ) != aDelegatorProps.end() )
         {
-            m_aPropertyAccessors[ prop.Handle ] = OPropertyAccessor( -1, 
nMPLoop, false );
+            m_aPropertyAccessors.insert_or_assign(
+                prop.Handle, OPropertyAccessor( -1, nMPLoop, false ));
             existingHandles.insert( prop.Handle );
         }
         else
@@ -111,7 +112,8 @@ 
OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
             }
 
             // remember the accessor for this property
-            m_aPropertyAccessors[ nHandle ] = OPropertyAccessor( prop.Handle, 
nMPLoop, true );
+            m_aPropertyAccessors.insert_or_assign(
+                nHandle, OPropertyAccessor( prop.Handle, nMPLoop, true ));
             prop.Handle = nHandle;
         }
     }
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index 4881b2a7c884..5be393be81e8 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -54,8 +54,6 @@ namespace internal
 
         OPropertyAccessor(sal_Int32 _nOriginalHandle, sal_Int32 _nPos, bool 
_bAggregate)
             :nOriginalHandle(_nOriginalHandle) ,nPos(_nPos) 
,bAggregate(_bAggregate) { }
-        OPropertyAccessor()
-            :nOriginalHandle(-1) ,nPos(-1) ,bAggregate(false) { }
 
         bool operator==(const OPropertyAccessor& rOb) const { return nPos == 
rOb.nPos; }
         bool operator <(const OPropertyAccessor& rOb) const { return nPos < 
rOb.nPos; }