diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-23 15:39:02 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-02-24 11:48:38 +0200 |
commit | 5d8474bae086bc798212186ff5057eb3350d225b (patch) | |
tree | 55ee987f4959c8e3df204df1bf716397e282cb9b /comphelper/source/property/propagg.cxx | |
parent | dc1f1cde6329044611607d8bfc10203b6d83dcee (diff) |
convert PropertyOrigin to scoped enum
Change-Id: I26c9929be8aad02030722508334e66f5028ffb37
Diffstat (limited to 'comphelper/source/property/propagg.cxx')
-rw-r--r-- | comphelper/source/property/propagg.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index 103b24327b7a..a1044c741f7c 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -146,7 +146,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper( OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper::classifyProperty( const OUString& _rName ) { - PropertyOrigin eOrigin = UNKNOWN_PROPERTY; + PropertyOrigin eOrigin = PropertyOrigin::Unknown; // look up the name const Property* pPropertyDescriptor = lcl_findPropertyByName( m_aProperties, _rName ); if ( pPropertyDescriptor ) @@ -156,7 +156,7 @@ OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper: OSL_ENSURE( m_aPropertyAccessors.end() != aPos, "OPropertyArrayAggregationHelper::classifyProperty: should have this handle in my map!" ); if ( m_aPropertyAccessors.end() != aPos ) { - eOrigin = aPos->second.bAggregate ? AGGREGATE_PROPERTY : DELEGATOR_PROPERTY; + eOrigin = aPos->second.bAggregate ? PropertyOrigin::Aggregate : PropertyOrigin::Delegator; } } return eOrigin; @@ -660,12 +660,12 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( for ( sal_Int32 i = 0; i < nLen; ++i, ++pNames ) { OPropertyArrayAggregationHelper::PropertyOrigin ePropOrg = rPH.classifyProperty( *pNames ); - if ( OPropertyArrayAggregationHelper::UNKNOWN_PROPERTY == ePropOrg ) + if ( OPropertyArrayAggregationHelper::PropertyOrigin::Unknown == ePropOrg ) throw WrappedTargetException( OUString(), static_cast< XMultiPropertySet* >( this ), makeAny( UnknownPropertyException( ) ) ); // due to a flaw in the API design, this method is not allowed to throw an UnknownPropertyException // so we wrap it into a WrappedTargetException - if ( OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY == ePropOrg ) + if ( OPropertyArrayAggregationHelper::PropertyOrigin::Aggregate == ePropOrg ) ++nAggCount; } @@ -705,7 +705,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( for ( sal_Int32 i = 0; i < nLen; ++i, ++pNames, ++pValues ) { - if ( OPropertyArrayAggregationHelper::AGGREGATE_PROPERTY == rPH.classifyProperty( *pNames ) ) + if ( OPropertyArrayAggregationHelper::PropertyOrigin::Aggregate == rPH.classifyProperty( *pNames ) ) { *pAggNames++ = *pNames; *pAggValues++ = *pValues; |