comphelper/source/property/propagg.cxx | 8 ++++----
include/comphelper/propagg.hxx | 5 +----
2 files changed, 5 insertions(+), 8 deletions(-)
New commits:
commit 388bed014ad19a23fa9879bc31a8088f34157a48
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu May 12 15:30:50 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri May 13 10:58:05 2022 +0200
Remove need for two typedefs
Change-Id: I8e576f0b2b417ed78e6f38b745e51cbf8b666c68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134262
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 d864450898d6..fb2db9589c8e 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -128,7 +128,7 @@ OPropertyArrayAggregationHelper::PropertyOrigin
OPropertyArrayAggregationHelper:
if ( pPropertyDescriptor )
{
// look up the handle for this name
- ConstPropertyAccessorMapIterator aPos = m_aPropertyAccessors.find(
pPropertyDescriptor->Handle );
+ auto aPos = m_aPropertyAccessors.find( pPropertyDescriptor->Handle );
OSL_ENSURE( m_aPropertyAccessors.end() != aPos,
"OPropertyArrayAggregationHelper::classifyProperty: should have this handle in
my map!" );
if ( m_aPropertyAccessors.end() != aPos )
{
@@ -172,7 +172,7 @@ sal_Int32
OPropertyArrayAggregationHelper::getHandleByName(const OUString& _rPro
sal_Bool OPropertyArrayAggregationHelper::fillPropertyMembersByHandle(
OUString* _pPropName, sal_Int16* _pAttributes, sal_Int32 _nHandle)
{
- ConstPropertyAccessorMapIterator i = m_aPropertyAccessors.find(_nHandle);
+ auto i = m_aPropertyAccessors.find(_nHandle);
bool bRet = i != m_aPropertyAccessors.end();
if (bRet)
{
@@ -188,7 +188,7 @@ sal_Bool
OPropertyArrayAggregationHelper::fillPropertyMembersByHandle(
bool OPropertyArrayAggregationHelper::getPropertyByHandle( sal_Int32 _nHandle,
Property& _rProperty ) const
{
- ConstPropertyAccessorMapIterator pos = m_aPropertyAccessors.find(_nHandle);
+ auto pos = m_aPropertyAccessors.find(_nHandle);
if ( pos != m_aPropertyAccessors.end() )
{
_rProperty = m_aProperties[ pos->second.nPos ];
@@ -201,7 +201,7 @@ bool OPropertyArrayAggregationHelper::getPropertyByHandle(
sal_Int32 _nHandle, P
bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle(
OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32
_nHandle) const
{
- ConstPropertyAccessorMapIterator i = m_aPropertyAccessors.find(_nHandle);
+ auto i = m_aPropertyAccessors.find(_nHandle);
bool bRet = i != m_aPropertyAccessors.end() && (*i).second.bAggregate;
if (bRet)
{
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index 5be393be81e8..f7e47298b88b 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -58,9 +58,6 @@ namespace internal
bool operator==(const OPropertyAccessor& rOb) const { return nPos ==
rOb.nPos; }
bool operator <(const OPropertyAccessor& rOb) const { return nPos <
rOb.nPos; }
};
-
- typedef std::map< sal_Int32, OPropertyAccessor > PropertyAccessorMap;
- typedef PropertyAccessorMap::const_iterator
ConstPropertyAccessorMapIterator;
}
@@ -93,7 +90,7 @@ class COMPHELPER_DLLPUBLIC OPropertyArrayAggregationHelper
final : public ::cppu
friend class OPropertySetAggregationHelper;
std::vector<css::beans::Property> m_aProperties;
- internal::PropertyAccessorMap m_aPropertyAccessors;
+ std::map< sal_Int32, internal::OPropertyAccessor > m_aPropertyAccessors;
public:
/** construct the object.
