mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove need for two typedefs

Browse Source 
Change-Id: I8e576f0b2b417ed78e6f38b745e51cbf8b666c68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134262
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2022-05-12 15:30:50 +02:00
parent 3bd7111fe2
commit 388bed014a
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
comphelper/source/property/propagg.cxx
View File

@@ -128,7 +128,7 @@ OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper:
if ( pPropertyDescriptor ) if ( pPropertyDescriptor )
{ {
// look up the handle for this name // 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!" ); OSL_ENSURE( m_aPropertyAccessors.end() != aPos, "OPropertyArrayAggregationHelper::classifyProperty: should have this handle in my map!" );
if ( m_aPropertyAccessors.end() != aPos ) if ( m_aPropertyAccessors.end() != aPos )
{ {
@@ -172,7 +172,7 @@ sal_Int32 OPropertyArrayAggregationHelper::getHandleByName(const OUString& _rPro
sal_Bool OPropertyArrayAggregationHelper::fillPropertyMembersByHandle( sal_Bool OPropertyArrayAggregationHelper::fillPropertyMembersByHandle(
OUString* _pPropName, sal_Int16* _pAttributes, sal_Int32 _nHandle) 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(); bool bRet = i != m_aPropertyAccessors.end();
if (bRet) if (bRet)
{ {
@@ -188,7 +188,7 @@ sal_Bool OPropertyArrayAggregationHelper::fillPropertyMembersByHandle(
bool OPropertyArrayAggregationHelper::getPropertyByHandle( sal_Int32 _nHandle, Property& _rProperty ) const 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() ) if ( pos != m_aPropertyAccessors.end() )
{ {
_rProperty = m_aProperties[ pos->second.nPos ]; _rProperty = m_aProperties[ pos->second.nPos ];
@@ -201,7 +201,7 @@ bool OPropertyArrayAggregationHelper::getPropertyByHandle( sal_Int32 _nHandle, P
bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle( bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle(
OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const 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; bool bRet = i != m_aPropertyAccessors.end() && (*i).second.bAggregate;
if (bRet) if (bRet)
{ {

5
include/comphelper/propagg.hxx
View File

@@ -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; }
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; friend class OPropertySetAggregationHelper;
std::vector<css::beans::Property> m_aProperties; std::vector<css::beans::Property> m_aProperties;
internal::PropertyAccessorMap m_aPropertyAccessors; std::map< sal_Int32, internal::OPropertyAccessor > m_aPropertyAccessors;
public: public:
/** construct the object. /** construct the object.