diff options
65 files changed, 582 insertions, 530 deletions
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index da56f0fcac7b..389856b4a5ef 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -705,7 +705,7 @@ void SAL_CALL SvxUnoTextField::setPropertyValue( const OUString& aPropertyName, return; } - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMap().getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMap().getByName( aPropertyName ); if ( !pMap ) throw beans::UnknownPropertyException(aPropertyName); @@ -760,7 +760,7 @@ uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyNam uno::Any aValue; - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMap().getByName( PropertyName ); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMap().getByName( PropertyName ); if ( !pMap ) throw beans::UnknownPropertyException(PropertyName); diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index fc70a623d0ef..9b7e24e18c5f 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -52,7 +52,7 @@ SvxItemPropertySet::~SvxItemPropertySet() } -uno::Any* SvxItemPropertySet::GetUsrAnyForID(SfxItemPropertySimpleEntry const & entry) const +uno::Any* SvxItemPropertySet::GetUsrAnyForID(SfxItemPropertyMapEntry const & entry) const { for (auto const & pActual : aCombineList) { @@ -64,7 +64,7 @@ uno::Any* SvxItemPropertySet::GetUsrAnyForID(SfxItemPropertySimpleEntry const & void SvxItemPropertySet::AddUsrAnyForID( - const uno::Any& rAny, SfxItemPropertySimpleEntry const & entry) + const uno::Any& rAny, SfxItemPropertyMapEntry const & entry) { std::unique_ptr<SvxIDPropertyCombine> pNew(new SvxIDPropertyCombine); pNew->nWID = entry.nWID; @@ -90,7 +90,7 @@ static bool SvxUnoCheckForPositiveValue( const uno::Any& rVal ) } -uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ) +uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertyMapEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ) { uno::Any aVal; if(!pMap || !pMap->nWID) @@ -136,7 +136,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* } -void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ) +void SvxItemPropertySet::setPropertyValue( const SfxItemPropertyMapEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ) { if(!pMap || !pMap->nWID) return; @@ -184,7 +184,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa } -uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap ) const +uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertyMapEntry* pMap ) const { // Already entered a value? Then finish quickly uno::Any* pUsrAny = GetUsrAnyForID(*pMap); @@ -236,7 +236,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* } -void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal ) const +void SvxItemPropertySet::setPropertyValue( const SfxItemPropertyMapEntry* pMap, const uno::Any& rVal ) const { uno::Any* pUsrAny = GetUsrAnyForID(*pMap); if(!pUsrAny) @@ -246,7 +246,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa } -const SfxItemPropertySimpleEntry* SvxItemPropertySet::getPropertyMapEntry(std::u16string_view rName) const +const SfxItemPropertyMapEntry* SvxItemPropertySet::getPropertyMapEntry(std::u16string_view rName) const { return m_aPropertyMap.getByName( rName ); } diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index af0a3db58ce0..d688e5701503 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -427,7 +427,7 @@ void SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const { CheckSelection( maSelection, pForwarder ); - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName ); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName ); if ( pMap ) { ESelection aSel( GetSelection() ); @@ -477,7 +477,7 @@ void SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const throw beans::UnknownPropertyException(PropertyName); } -void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) +void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertyMapEntry* pMap, const uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) { if(!SetPropertyValueHelper( pMap, rValue, rNewSet, &rSelection, GetEditSource() )) { @@ -488,7 +488,7 @@ void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pM } } -bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemPropertySimpleEntry* pMap, const uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL*/ ) +bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemPropertyMapEntry* pMap, const uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL*/ ) { switch( pMap->nWID ) { @@ -598,7 +598,7 @@ uno::Any SvxUnoTextRangeBase::_getPropertyValue(const OUString& PropertyName, sa SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; if( pForwarder ) { - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName ); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName ); if( pMap ) { std::unique_ptr<SfxItemSet> pAttribs; @@ -619,7 +619,7 @@ uno::Any SvxUnoTextRangeBase::_getPropertyValue(const OUString& PropertyName, sa throw beans::UnknownPropertyException(PropertyName); } -void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, uno::Any& rAny, const SfxItemSet& rSet ) +void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertyMapEntry* pMap, uno::Any& rAny, const SfxItemSet& rSet ) { switch( pMap->nWID ) { @@ -659,7 +659,7 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM } } -bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet const & rSet, const SfxItemPropertySimpleEntry* pMap, uno::Any& aAny, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL */ ) +bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet const & rSet, const SfxItemPropertyMapEntry* pMap, uno::Any& aAny, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL */ ) { switch( pMap->nWID ) { @@ -778,7 +778,7 @@ void SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& a for( ; nCount; nCount--, pPropertyNames++, pValues++ ) { - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry( *pPropertyNames ); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry( *pPropertyNames ); if( pMap ) { @@ -893,7 +893,7 @@ uno::Sequence< uno::Any > SvxUnoTextRangeBase::_getPropertyValues( const uno::Se for( ; nCount; nCount--, pPropertyNames++, pValues++ ) { - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry( *pPropertyNames ); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry( *pPropertyNames ); if( pMap ) { getPropertyValue( pMap, *pValues, *pAttribs ); @@ -926,7 +926,7 @@ const sal_uInt16 aSvxUnoFontDescriptorWhichMap[] = { EE_CHAR_FONTINFO, EE_CHAR_F EE_CHAR_UNDERLINE, EE_CHAR_WEIGHT, EE_CHAR_STRIKEOUT, EE_CHAR_CASEMAP, EE_CHAR_WLM, 0 }; -beans::PropertyState SvxUnoTextRangeBase::_getPropertyState(const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara) +beans::PropertyState SvxUnoTextRangeBase::_getPropertyState(const SfxItemPropertyMapEntry* pMap, sal_Int32 nPara) { if ( pMap ) { @@ -1051,7 +1051,7 @@ uno::Sequence< beans::PropertyState > SvxUnoTextRangeBase::_getPropertyStates(co beans::PropertyState* pState = aRet.getArray(); for( const OUString& rName : PropertyName ) { - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry( rName ); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry( rName ); if( !_getOnePropertyStates(pSet.get(), pMap, *pState++) ) { throw beans::UnknownPropertyException(rName); @@ -1062,7 +1062,7 @@ uno::Sequence< beans::PropertyState > SvxUnoTextRangeBase::_getPropertyStates(co return aRet; } -bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, beans::PropertyState& rState) +bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertyMapEntry* pMap, beans::PropertyState& rState) { bool bUnknownPropertyFound = false; if(pSet && pMap) @@ -1161,7 +1161,7 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sa if( pForwarder ) { - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry( PropertyName ); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry( PropertyName ); if ( pMap ) { CheckSelection( maSelection, mpEditSource->GetTextForwarder() ); @@ -1173,7 +1173,7 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sa throw beans::UnknownPropertyException(PropertyName); } -void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) +void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, const SfxItemPropertyMapEntry* pMap, sal_Int32 nPara ) { do { @@ -1221,7 +1221,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp SvxTextForwarder* pForwarder = mpEditSource ? mpEditSource->GetTextForwarder() : nullptr; if( pForwarder ) { - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry( aPropertyName ); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry( aPropertyName ); if( pMap ) { SfxItemPool* pPool = pForwarder->GetPool(); @@ -1268,9 +1268,9 @@ void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault() if( pForwarder ) { - for (auto & entry : mpPropSet->getPropertyMap().getPropertyEntries()) + for (const SfxItemPropertyMapEntry* entry : mpPropSet->getPropertyMap().getPropertyEntries()) { - _setPropertyToDefault( pForwarder, &entry.second, -1 ); + _setPropertyToDefault( pForwarder, entry, -1 ); } } } @@ -1970,7 +1970,7 @@ static void SvxPropertyValuesToItemSet( { for (const beans::PropertyValue& rProp : rPropertyValues) { - const SfxItemPropertySimpleEntry *pEntry = pPropSet->getPropertyMap().getByName( rProp.Name ); + const SfxItemPropertyMapEntry *pEntry = pPropSet->getPropertyMap().getByName( rProp.Name ); if (!pEntry) throw beans::UnknownPropertyException( "Unknown property: " + rProp.Name, static_cast < cppu::OWeakObject * > ( nullptr ) ); // Note: there is no need to take special care of the properties diff --git a/include/editeng/unoipset.hxx b/include/editeng/unoipset.hxx index 0a4d8c2fe3ad..e510462b4dc9 100644 --- a/include/editeng/unoipset.hxx +++ b/include/editeng/unoipset.hxx @@ -45,21 +45,21 @@ public: SvxItemPropertySet( SvxItemPropertySet const & ) = delete; // MSVC2015 workaround // Methods, which work directly with the ItemSet - static css::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ); - static void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const css::uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ); + static css::uno::Any getPropertyValue( const SfxItemPropertyMapEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ); + static void setPropertyValue( const SfxItemPropertyMapEntry* pMap, const css::uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ); // Methods that use Any instead - css::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap ) const; - void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const css::uno::Any& rVal ) const; + css::uno::Any getPropertyValue( const SfxItemPropertyMapEntry* pMap ) const; + void setPropertyValue( const SfxItemPropertyMapEntry* pMap, const css::uno::Any& rVal ) const; bool AreThereOwnUsrAnys() const { return ! aCombineList.empty(); } - css::uno::Any* GetUsrAnyForID(SfxItemPropertySimpleEntry const & entry) const; - void AddUsrAnyForID(const css::uno::Any& rAny, SfxItemPropertySimpleEntry const & entry); + css::uno::Any* GetUsrAnyForID(SfxItemPropertyMapEntry const & entry) const; + void AddUsrAnyForID(const css::uno::Any& rAny, SfxItemPropertyMapEntry const & entry); void ClearAllUsrAny(); css::uno::Reference< css::beans::XPropertySetInfo > const & getPropertySetInfo() const; const SfxItemPropertyMap& getPropertyMap() const { return m_aPropertyMap;} - const SfxItemPropertySimpleEntry* getPropertyMapEntry(std::u16string_view rName) const; + const SfxItemPropertyMapEntry* getPropertyMapEntry(std::u16string_view rName) const; }; /** converts the given any with a metric to 100th/mm if needed */ diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index a07a8cf059e1..069e7e06789d 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -271,30 +271,30 @@ protected: /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - css::beans::PropertyState _getPropertyState( const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara = -1 ); + css::beans::PropertyState _getPropertyState( const SfxItemPropertyMapEntry* pMap, sal_Int32 nPara = -1 ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - css::beans::PropertyState _getPropertyState( std::u16string_view PropertyName, sal_Int32 nPara = -1 ); + css::beans::PropertyState _getPropertyState( std::u16string_view PropertyName, sal_Int32 nPara = -1 ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException css::uno::Sequence< css::beans::PropertyState > _getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1 ); // returns true if property found or false if unknown property - static bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, css::beans::PropertyState& rState); + static bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertyMapEntry* pMap, css::beans::PropertyState& rState); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException void _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ); + void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertyMapEntry* pMap, sal_Int32 nPara ); void SetEditSource( SvxEditSource* _pEditSource ) throw(); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - void getPropertyValue( const SfxItemPropertySimpleEntry* pMap, css::uno::Any& rAny, const SfxItemSet& rSet ); + void getPropertyValue( const SfxItemPropertyMapEntry* pMap, css::uno::Any& rAny, const SfxItemSet& rSet ); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::IllegalArgumentException - void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const css::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ); + void setPropertyValue( const SfxItemPropertyMapEntry* pMap, const css::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ); SvxUnoTextRangeBase(const SvxItemPropertySet* _pSet); SvxUnoTextRangeBase(const SvxEditSource* pSource, const SvxItemPropertySet* _pSet); @@ -323,9 +323,9 @@ public: const SvxItemPropertySet* getPropertySet() const throw() { return mpPropSet; } SvxEditSource* GetEditSource() const throw() { return mpEditSource.get(); } - static bool SetPropertyValueHelper( const SfxItemPropertySimpleEntry* pMap, const css::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = nullptr, SvxEditSource* pEditSource = nullptr ); + static bool SetPropertyValueHelper( const SfxItemPropertyMapEntry* pMap, const css::uno::Any& aValue, SfxItemSet& rNewSet, const ESelection* pSelection = nullptr, SvxEditSource* pEditSource = nullptr ); /// @throws css::uno::RuntimeException - static bool GetPropertyValueHelper( SfxItemSet const & rSet, const SfxItemPropertySimpleEntry* pMap, css::uno::Any& aAny, const ESelection* pSelection = nullptr, SvxEditSource* pEditSource = nullptr ); + static bool GetPropertyValueHelper( SfxItemSet const & rSet, const SfxItemPropertyMapEntry* pMap, css::uno::Any& aAny, const ESelection* pSelection = nullptr, SvxEditSource* pEditSource = nullptr ); void attachField( std::unique_ptr<SvxFieldData> pData ) throw(); diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index 6403dbbc1fa6..4ea43eab7e64 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -27,6 +27,7 @@ #include <svl/svldllapi.h> #include <vector> #include <unordered_map> +#include <o3tl/sorted_vector.hxx> #include <string_view> // values from com/sun/star/beans/PropertyAttribute @@ -35,7 +36,7 @@ /// map a property between beans::XPropertySet and SfxPoolItem struct SfxItemPropertyMapEntry { - std::u16string_view aName; ///< name of property + OUString aName; ///< name of property css::uno::Type aType; ///< UNO type of property sal_uInt16 nWID; ///< WhichId of SfxPoolItem /// flag bitmap, @see css::beans::PropertyAttribute @@ -45,7 +46,7 @@ struct SfxItemPropertyMapEntry sal_uInt8 nMemberId; PropertyMoreFlags nMoreFlags; - SfxItemPropertyMapEntry(std::u16string_view _aName, sal_uInt16 _nWID, css::uno::Type const & _rType, + SfxItemPropertyMapEntry(const OUString & _aName, sal_uInt16 _nWID, css::uno::Type const & _rType, sal_Int16 _nFlags, sal_uInt8 const _nMemberId, PropertyMoreFlags _nMoreFlags = PropertyMoreFlags::NONE) : aName( _aName ) , aType( _rType ) @@ -104,35 +105,41 @@ struct SfxItemPropertySimpleEntry } }; + struct SfxItemPropertyNamedEntry : public SfxItemPropertySimpleEntry { OUString sName; SfxItemPropertyNamedEntry( const OUString& rName, const SfxItemPropertySimpleEntry& rSimpleEntry) : SfxItemPropertySimpleEntry( rSimpleEntry ) , sName( rName ) -{ -} + { + } +}; + +struct SfxItemPropertyMapCompare +{ + bool operator() ( const SfxItemPropertyMapEntry * lhs, const SfxItemPropertyMapEntry * rhs ) const + { + return lhs->aName < rhs->aName; + } }; class SVL_DLLPUBLIC SfxItemPropertyMap { - std::unordered_map< std::u16string_view, - SfxItemPropertySimpleEntry > m_aMap; + o3tl::sorted_vector< const SfxItemPropertyMapEntry*, SfxItemPropertyMapCompare > m_aMap; mutable css::uno::Sequence< css::beans::Property > m_aPropSeq; public: SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries ); SfxItemPropertyMap( const SfxItemPropertyMap& rSource ); ~SfxItemPropertyMap(); - const SfxItemPropertySimpleEntry* getByName( std::u16string_view rName ) const; + const SfxItemPropertyMapEntry* getByName( std::u16string_view rName ) const; css::uno::Sequence< css::beans::Property > const & getProperties() const; /// @throws css::beans::UnknownPropertyException css::beans::Property getPropertyByName( const OUString & rName ) const; bool hasPropertyByName( std::u16string_view rName ) const; - void mergeProperties( const css::uno::Sequence< css::beans::Property >& rPropSeq ); - const std::unordered_map< std::u16string_view, - SfxItemPropertySimpleEntry >& getPropertyEntries() const { return m_aMap; } + const o3tl::sorted_vector< const SfxItemPropertyMapEntry*, SfxItemPropertyMapCompare >& getPropertyEntries() const { return m_aMap; } sal_uInt32 getSize() const; }; @@ -148,7 +155,7 @@ public: ~SfxItemPropertySet(); /// @throws css::uno::RuntimeException - void getPropertyValue( const SfxItemPropertySimpleEntry& rEntry, + void getPropertyValue( const SfxItemPropertyMapEntry& rEntry, const SfxItemSet& rSet, css::uno::Any& rAny) const; /// @throws css::uno::RuntimeException @@ -163,7 +170,7 @@ public: const SfxItemSet& rSet ) const; /// @throws css::uno::RuntimeException /// @throws css::lang::IllegalArgumentException - void setPropertyValue( const SfxItemPropertySimpleEntry& rEntry, + void setPropertyValue( const SfxItemPropertyMapEntry& rEntry, const css::uno::Any& aVal, SfxItemSet& rSet ) const; /// @throws css::uno::RuntimeException @@ -177,7 +184,7 @@ public: css::beans::PropertyState getPropertyState(const OUString& rName, const SfxItemSet& rSet)const; css::beans::PropertyState - getPropertyState(const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet) const + getPropertyState(const SfxItemPropertyMapEntry& rEntry, const SfxItemSet& rSet) const throw(); css::uno::Reference<css::beans::XPropertySetInfo> const & @@ -213,7 +220,6 @@ class SAL_DLLPUBLIC_TEMPLATE SfxExtItemPropertySetInfo_Base : public cppu::WeakI class SVL_DLLPUBLIC SfxExtItemPropertySetInfo final : public SfxExtItemPropertySetInfo_Base { - SfxItemPropertyMap aExtMap; public: SfxExtItemPropertySetInfo( const SfxItemPropertyMapEntry *pMap, @@ -228,6 +234,10 @@ public: virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override; + +private: + std::unordered_map<OUString, SfxItemPropertySimpleEntry> maMap; + mutable css::uno::Sequence< css::beans::Property > m_aPropSeq; }; #endif diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 1cd151d316ec..44ffc43e4f3b 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -81,10 +81,10 @@ class SvxShapeMaster; class SvxItemPropertySet; class SfxItemSet; -void SVXCORE_DLLPUBLIC SvxItemPropertySet_setPropertyValue( const SfxItemPropertySimpleEntry* pMap, +void SVXCORE_DLLPUBLIC SvxItemPropertySet_setPropertyValue( const SfxItemPropertyMapEntry* pMap, const css::uno::Any& rVal, SfxItemSet& rSet ); -css::uno::Any SVXCORE_DLLPUBLIC SvxItemPropertySet_getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ); +css::uno::Any SVXCORE_DLLPUBLIC SvxItemPropertySet_getPropertyValue( const SfxItemPropertyMapEntry* pMap, const SfxItemSet& rSet ); // WARNING: if you update the supported interfaces, @@ -147,7 +147,7 @@ protected: void ForceMetricToItemPoolMetric(basegfx::B2DHomMatrix& rB2DHomMatrix) const throw(); void ForceMetricTo100th_mm(basegfx::B2DHomMatrix& rB2DHomMatrix) const throw(); - css::uno::Any GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap ) const; + css::uno::Any GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertyMapEntry* pMap ) const; bool SetFillAttribute( sal_uInt16 nWID, const OUString& rName ); @@ -171,17 +171,17 @@ protected: /// @throws css::lang::IllegalArgumentException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ); + virtual bool getPropertyStateImpl( const SfxItemPropertyMapEntry* pProperty, css::beans::PropertyState& rState ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ); + virtual bool setPropertyToDefaultImpl( const SfxItemPropertyMapEntry* pProperty ); public: /// @throws css::uno::RuntimeException @@ -359,10 +359,10 @@ protected: protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; - virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) override; - virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool getPropertyStateImpl( const SfxItemPropertyMapEntry* pProperty, css::beans::PropertyState& rState ) override; + virtual bool setPropertyToDefaultImpl( const SfxItemPropertyMapEntry* pProperty ) override; public: SvxShapeText(SdrObject* pObj); @@ -591,8 +591,8 @@ class SVXCORE_DLLPUBLIC SvxOle2Shape : public SvxShapeText { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; void resetModifiedState(); @@ -617,8 +617,8 @@ class SvxShapePolyPolygon final : public SvxShapeText using SvxUnoTextRangeBase::getPropertyValue; // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; // local helper to detect PolygonKind from SdrObject::GetObjIdentifier() css::drawing::PolygonKind GetPolygonKind() const; @@ -645,8 +645,8 @@ class SvxGraphicObject final : public SvxShapeText using SvxUnoTextRangeBase::getPropertyValue; // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; public: SvxGraphicObject(SdrObject* pObj); @@ -668,8 +668,8 @@ protected: public: Svx3DSceneObject(SdrObject* pObj, SvxDrawPage* pDrawPage); // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl(const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; virtual ~Svx3DSceneObject() throw() override; @@ -709,8 +709,8 @@ public: class Svx3DCubeObject final : public SvxShape { // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; public: Svx3DCubeObject(SdrObject* pObj); @@ -729,8 +729,8 @@ public: Svx3DSphereObject(SdrObject* pObj); private: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; virtual ~Svx3DSphereObject() throw() override; @@ -744,8 +744,8 @@ private: class Svx3DLatheObject final : public SvxShape { // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; public: Svx3DLatheObject(SdrObject* pObj); @@ -764,8 +764,8 @@ public: Svx3DExtrudeObject(SdrObject* pObj); private: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; virtual ~Svx3DExtrudeObject() throw() override; @@ -779,8 +779,8 @@ private: class Svx3DPolygonObject final : public SvxShape { // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; public: Svx3DPolygonObject(SdrObject* pObj); @@ -802,7 +802,7 @@ protected: public: SvxCustomShape(SdrObject* pObj); // override these for special property handling in subcasses. Return true if property is handled - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; virtual ~SvxCustomShape() throw () override; @@ -840,8 +840,8 @@ public: private: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; OUString referer_; }; diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index f7d7e4c0bf29..ac9f0678ffaf 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -220,7 +220,7 @@ void SAL_CALL LinguProps::setPropertyValue( { MutexGuard aGuard( GetLinguMutex() ); - const SfxItemPropertySimpleEntry* pCur = aPropertyMap.getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pCur = aPropertyMap.getByName( rPropertyName ); if (pCur) { Any aOld( aConfig.GetProperty( pCur->nWID ) ); @@ -239,7 +239,7 @@ Any SAL_CALL LinguProps::getPropertyValue( const OUString& rPropertyName ) Any aRet; - const SfxItemPropertySimpleEntry* pCur = aPropertyMap.getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pCur = aPropertyMap.getByName( rPropertyName ); if(pCur) { aRet = aConfig.GetProperty( pCur->nWID ); @@ -256,7 +256,7 @@ void SAL_CALL LinguProps::addPropertyChangeListener( if (!bDisposing && rxListener.is()) { - const SfxItemPropertySimpleEntry* pCur = aPropertyMap.getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pCur = aPropertyMap.getByName( rPropertyName ); if(pCur) aPropListeners.addInterface( pCur->nWID, rxListener ); } @@ -270,7 +270,7 @@ void SAL_CALL LinguProps::removePropertyChangeListener( if (!bDisposing && rxListener.is()) { - const SfxItemPropertySimpleEntry* pCur = aPropertyMap.getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pCur = aPropertyMap.getByName( rPropertyName ); if(pCur) aPropListeners.removeInterface( pCur->nWID, rxListener ); } @@ -319,9 +319,9 @@ Sequence< PropertyValue > SAL_CALL std::vector<PropertyValue> aProps; aProps.reserve(aPropertyMap.getPropertyEntries().size()); - for(auto & rPair : aPropertyMap.getPropertyEntries()) - aProps.push_back(PropertyValue(OUString(rPair.first), rPair.second.nWID, - aConfig.GetProperty(rPair.second.nWID), + for(auto pEntry : aPropertyMap.getPropertyEntries()) + aProps.push_back(PropertyValue(pEntry->aName, pEntry->nWID, + aConfig.GetProperty(pEntry->nWID), css::beans::PropertyState_DIRECT_VALUE)); return comphelper::containerToSequence(aProps); } diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 14262558618c..1981b229e567 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -276,15 +276,15 @@ namespace uno::Reference< beans::XPropertySetInfo> xInfo = _xShape->getPropertySetInfo(); SvxUnoPropertyMapProvider aMap; const SfxItemPropertyMap& rPropertyMap = aMap.GetPropertySet(SVXMAP_CUSTOMSHAPE, SdrObject::GetGlobalDrawObjectItemPool())->getPropertyMap(); - for (const auto& rProp : rPropertyMap.getPropertyEntries()) + for (const auto pProp : rPropertyMap.getPropertyEntries()) { - if ( xInfo->hasPropertyByName(OUString(rProp.first)) ) + if ( xInfo->hasPropertyByName(pProp->aName) ) { - const SfxPoolItem* pItem = _rItemSet.GetItem(rProp.second.nWID); + const SfxPoolItem* pItem = _rItemSet.GetItem(pProp->nWID); if ( pItem ) { - ::std::unique_ptr<SfxPoolItem> pClone(pItem->CloneSetWhich(rProp.second.nWID)); - pClone->PutValue(_xShape->getPropertyValue(OUString(rProp.first)), rProp.second.nMemberId); + ::std::unique_ptr<SfxPoolItem> pClone(pItem->CloneSetWhich(pProp->nWID)); + pClone->PutValue(_xShape->getPropertyValue(pProp->aName), pProp->nMemberId); _rItemSet.Put(std::move(pClone)); } } @@ -296,20 +296,20 @@ namespace const uno::Reference< beans::XPropertySetInfo> xInfo = _xShape->getPropertySetInfo(); SvxUnoPropertyMapProvider aMap; const SfxItemPropertyMap& rPropertyMap = aMap.GetPropertySet(SVXMAP_CUSTOMSHAPE, SdrObject::GetGlobalDrawObjectItemPool())->getPropertyMap(); - for (const auto& rProp : rPropertyMap.getPropertyEntries()) + for (const auto pProp : rPropertyMap.getPropertyEntries()) { - if ( SfxItemState::SET == _rItemSet.GetItemState(rProp.second.nWID) && xInfo->hasPropertyByName(OUString(rProp.first)) ) + if ( SfxItemState::SET == _rItemSet.GetItemState(pProp->nWID) && xInfo->hasPropertyByName(pProp->aName) ) { - if ( ( rProp.second.nFlags & beans::PropertyAttribute::READONLY ) != beans::PropertyAttribute::READONLY ) + if ( ( pProp->nFlags & beans::PropertyAttribute::READONLY ) != beans::PropertyAttribute::READONLY ) { - const SfxPoolItem* pItem = _rItemSet.GetItem(rProp.second.nWID); + const SfxPoolItem* pItem = _rItemSet.GetItem(pProp->nWID); if ( pItem ) { uno::Any aValue; - pItem->QueryValue(aValue,rProp.second.nMemberId); + pItem->QueryValue(aValue, pProp->nMemberId); try { - _xShape->setPropertyValue(OUString(rProp.first), aValue); + _xShape->setPropertyValue(pProp->aName, aValue); } catch(uno::Exception&) { // shapes have a bug so we ignore this one. diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index 29e33e37974e..ca0dc2fcc2df 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -114,6 +114,7 @@ class SfxItemPropertyMap; class SfxItemPropertySet; class SfxItemSet; struct SfxItemPropertySimpleEntry; +struct SfxItemPropertyMapEntry; namespace editeng { class SvxBorderLine; } @@ -220,13 +221,13 @@ protected: // GetItemPropertyMap for derived classes must contain all entries, including base class virtual const SfxItemPropertyMap& GetItemPropertyMap(); css::beans::PropertyState GetOnePropertyState( - sal_uInt16 nItemWhich, const SfxItemPropertySimpleEntry* pEntry ); + sal_uInt16 nItemWhich, const SfxItemPropertyMapEntry* pEntry ); /// @throws css::uno::RuntimeException - virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, + virtual void GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, css::uno::Any& ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, + virtual void SetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, const css::uno::Any& aValue ); public: @@ -477,9 +478,9 @@ private: protected: const ScRange& GetRange() const { return aRange; } virtual const SfxItemPropertyMap& GetItemPropertyMap() override; - virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, + virtual void GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, css::uno::Any& ) override; - virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, + virtual void SetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, const css::uno::Any& aValue ) override; /// @throws css::lang::IndexOutOfBoundsException @@ -650,9 +651,9 @@ private: sal_Int32 GetResultType_Impl() const; virtual const SfxItemPropertyMap& GetItemPropertyMap() override; - virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, + virtual void GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, css::uno::Any& ) override; - virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, + virtual void SetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, const css::uno::Any& aValue ) override; public: @@ -789,9 +790,9 @@ private: protected: virtual const SfxItemPropertyMap& GetItemPropertyMap() override; - virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, + virtual void GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, css::uno::Any& ) override; - virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, + virtual void SetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, const css::uno::Any& aValue ) override; public: @@ -966,9 +967,9 @@ private: const SfxItemPropertySet* pColPropSet; virtual const SfxItemPropertyMap& GetItemPropertyMap() override; - virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, + virtual void GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, css::uno::Any& ) override; - virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, + virtual void SetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, const css::uno::Any& aValue ) override; public: @@ -1004,9 +1005,9 @@ private: const SfxItemPropertySet* pRowPropSet; virtual const SfxItemPropertyMap& GetItemPropertyMap() override; - virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, + virtual void GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, css::uno::Any& ) override; - virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, + virtual void SetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, const css::uno::Any& aValue ) override; public: diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index 7fb72dd4abea..53dcdcb05e38 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -44,6 +44,7 @@ class SfxItemSet; class ScStyleFamilyObj; class ScStyleObj; struct SfxItemPropertySimpleEntry; +struct SfxItemPropertyMapEntry; class ScStyleFamiliesObj final : public ::cppu::WeakImplHelper< css::container::XIndexAccess, @@ -173,7 +174,7 @@ private: SfxStyleSheetBase* pStyle_cached; SfxStyleSheetBase* GetStyle_Impl( bool bUseCachedValue = false ); - const SfxItemSet* GetStyleItemSet_Impl( std::u16string_view rPropName, const SfxItemPropertySimpleEntry*& rpEntry ); + const SfxItemSet* GetStyleItemSet_Impl( std::u16string_view rPropName, const SfxItemPropertyMapEntry*& rpEntry ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException css::beans::PropertyState getPropertyState_Impl( std::u16string_view PropertyName ); @@ -188,7 +189,7 @@ private: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException void setPropertyValue_Impl( std::u16string_view rPropertyName, - const SfxItemPropertySimpleEntry* pEntry, + const SfxItemPropertyMapEntry* pEntry, const css::uno::Any* pValue ); public: diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index b343fd1afe36..b67d9a6edd15 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -566,7 +566,7 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); - const SfxItemPropertySimpleEntry* pEntry = + const SfxItemPropertyMapEntry* pEntry = aPropSet.getPropertyMap().getByName( aPropertyName ); if ( !(pEntry && pEntry->nWID && nFormatIndex < pFormats->size()) ) @@ -668,7 +668,7 @@ uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const OUString& aPrope uno::Any aVal; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); - const SfxItemPropertySimpleEntry* pEntry = + const SfxItemPropertyMapEntry* pEntry = aPropSet.getPropertyMap().getByName( aPropertyName ); if ( pEntry && pEntry->nWID && nFormatIndex < pFormats->size() ) diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 8365bd4013f1..bd234108221b 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -1772,7 +1772,7 @@ const SfxItemPropertyMap& ScCellRangesBase::GetItemPropertyMap() return pPropSet->getPropertyMap(); } -static void lcl_GetPropertyWhich( const SfxItemPropertySimpleEntry* pEntry, +static void lcl_GetPropertyWhich( const SfxItemPropertyMapEntry* pEntry, sal_uInt16& rItemWhich ) { // Which-ID of the affected items also when the item can't handle @@ -1803,7 +1803,7 @@ static void lcl_GetPropertyWhich( const SfxItemPropertySimpleEntry* pEntry, } -beans::PropertyState ScCellRangesBase::GetOnePropertyState( sal_uInt16 nItemWhich, const SfxItemPropertySimpleEntry* pEntry ) +beans::PropertyState ScCellRangesBase::GetOnePropertyState( sal_uInt16 nItemWhich, const SfxItemPropertyMapEntry* pEntry ) { beans::PropertyState eRet = beans::PropertyState_DIRECT_VALUE; if ( nItemWhich ) // item wid (from map or special case) @@ -1859,7 +1859,7 @@ beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const OUString const SfxItemPropertyMap& rMap = GetItemPropertyMap(); // from derived class sal_uInt16 nItemWhich = 0; - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName( aPropertyName ); lcl_GetPropertyWhich( pEntry, nItemWhich ); return GetOnePropertyState( nItemWhich, pEntry ); } @@ -1875,7 +1875,7 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates std::transform(aPropertyNames.begin(), aPropertyNames.end(), aRet.begin(), [this, &rPropertyMap](const auto& rName) -> beans::PropertyState { sal_uInt16 nItemWhich = 0; - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( rName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( rName ); lcl_GetPropertyWhich( pEntry, nItemWhich ); return GetOnePropertyState(nItemWhich, pEntry); }); @@ -1890,7 +1890,7 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const OUString& aPropertyN const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap(); // from derived class sal_uInt16 nItemWhich = 0; - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); lcl_GetPropertyWhich( pEntry, nItemWhich ); if ( nItemWhich ) // item wid (from map or special case) { @@ -1937,7 +1937,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const OUString& aPropert { ScDocument& rDoc = pDocShell->GetDocument(); const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( pEntry ) { if ( IsScItemWid( pEntry->nWID ) ) @@ -2040,7 +2040,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangesBase::getPropertySe return aRef; } -static void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const uno::Any& rValue, +static void lcl_SetCellProperty( const SfxItemPropertyMapEntry& rEntry, const uno::Any& rValue, ScPatternAttr& rPattern, const ScDocument &rDoc, sal_uInt16& rFirstItemId, sal_uInt16& rSecondItemId ) { @@ -2158,14 +2158,14 @@ void SAL_CALL ScCellRangesBase::setPropertyValue( throw uno::RuntimeException(); const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); SetOnePropertyValue( pEntry, aValue ); } -void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) +void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, const uno::Any& aValue ) { if ( !pEntry ) return; @@ -2370,7 +2370,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const OUString& aPropertyN throw uno::RuntimeException(); const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -2379,7 +2379,7 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const OUString& aPropertyN return aAny; } -void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) +void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, uno::Any& rAny ) { if ( !pEntry ) return; @@ -2578,7 +2578,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString const OUString* pNames = aPropertyNames.getConstArray(); const uno::Any* pValues = aValues.getConstArray(); - std::unique_ptr<const SfxItemPropertySimpleEntry*[]> pEntryArray(new const SfxItemPropertySimpleEntry*[nCount]); + std::unique_ptr<const SfxItemPropertyMapEntry*[]> pEntryArray(new const SfxItemPropertyMapEntry*[nCount]); sal_Int32 i; for(i = 0; i < nCount; i++) @@ -2586,7 +2586,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString // first loop: find all properties in map, but handle only CellStyle // (CellStyle must be set before any other cell properties) - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( pNames[i] ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( pNames[i] ); pEntryArray[i] = pEntry; if (pEntry) { @@ -2612,7 +2612,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString { // second loop: handle other properties - const SfxItemPropertySimpleEntry* pEntry = pEntryArray[i]; + const SfxItemPropertyMapEntry* pEntry = pEntryArray[i]; if ( pEntry ) { if ( IsScItemWid( pEntry->nWID ) ) // can be handled by SfxItemPropertySet @@ -2658,7 +2658,7 @@ uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues( uno::Any* pProperties = aRet.getArray(); for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++) { - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyNames[i] ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyNames[i] ); GetOnePropertyValue( pEntry, pProperties[i] ); } return aRet; @@ -2713,7 +2713,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set const OUString* pNames = aPropertyNames.getConstArray(); const uno::Any* pValues = aValues.getConstArray(); - std::unique_ptr<const SfxItemPropertySimpleEntry*[]> pMapArray(new const SfxItemPropertySimpleEntry*[nCount]); + std::unique_ptr<const SfxItemPropertyMapEntry*[]> pMapArray(new const SfxItemPropertyMapEntry*[nCount]); sal_Int32 i; for(i = 0; i < nCount; i++) @@ -2721,7 +2721,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set // first loop: find all properties in map, but handle only CellStyle // (CellStyle must be set before any other cell properties) - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( pNames[i] ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( pNames[i] ); pMapArray[i] = pEntry; if (pEntry) { @@ -2748,7 +2748,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set { // second loop: handle other properties - const SfxItemPropertySimpleEntry* pEntry = pMapArray[i]; + const SfxItemPropertyMapEntry* pEntry = pMapArray[i]; if ( pEntry && ((pEntry->nFlags & beans::PropertyAttribute::READONLY) == 0)) { if ( IsScItemWid( pEntry->nWID ) ) // can be handled by SfxItemPropertySet @@ -2824,7 +2824,7 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::get for(sal_Int32 i = 0; i < nCount; i++) { - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyNames[i] ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyNames[i] ); if (!pEntry) { pReturns[i].Result = beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY; @@ -2854,7 +2854,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBas sal_Int32 j = 0; for(sal_Int32 i = 0; i < nCount; i++) { - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyNames[i] ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyNames[i] ); if (!pEntry) { pReturns[i].Result = beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY; @@ -5709,7 +5709,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangeObj::getPropertySetI return aRef; } -void ScCellRangeObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) +void ScCellRangeObj::SetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, const uno::Any& aValue ) { // Range has only Position and Size in addition to ScCellRangesBase, both are ReadOnly // -> nothing to do here @@ -5717,7 +5717,7 @@ void ScCellRangeObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEnt ScCellRangesBase::SetOnePropertyValue( pEntry, aValue ); } -void ScCellRangeObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) +void ScCellRangeObj::GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, uno::Any& rAny ) { if ( !pEntry ) return; @@ -6407,7 +6407,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellObj::getPropertySetInfo() return aRef; } -void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) +void ScCellObj::SetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, const uno::Any& aValue ) { if ( !pEntry ) return; @@ -6428,7 +6428,7 @@ void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, c ScCellRangeObj::SetOnePropertyValue( pEntry, aValue ); } -void ScCellObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) +void ScCellObj::GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, uno::Any& rAny ) { if ( !pEntry ) return; @@ -7810,7 +7810,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableSheetObj::getPropertySet return aRef; } -void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) +void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, const uno::Any& aValue ) { if ( !pEntry ) return; @@ -8137,7 +8137,7 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn ScCellRangeObj::SetOnePropertyValue(pEntry, aValue); // base class, no Item WID } -void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, +void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, uno::Any& rAny ) { if ( !pEntry ) @@ -8380,7 +8380,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnObj::getPropertySe return aRef; } -void ScTableColumnObj::SetOnePropertyValue(const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue) +void ScTableColumnObj::SetOnePropertyValue(const SfxItemPropertyMapEntry* pEntry, const uno::Any& aValue) { if ( !pEntry ) return; @@ -8443,7 +8443,7 @@ void ScTableColumnObj::SetOnePropertyValue(const SfxItemPropertySimpleEntry* pEn ScCellRangeObj::SetOnePropertyValue(pEntry, aValue); // base class, no Item WID } -void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) +void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, uno::Any& rAny ) { if ( !pEntry ) return; @@ -8516,7 +8516,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowObj::getPropertySetIn return aRef; } -void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) +void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, const uno::Any& aValue ) { if ( !pEntry ) return; @@ -8590,7 +8590,7 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr ScCellRangeObj::SetOnePropertyValue(pEntry, aValue); // base class, no Item WID } -void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) +void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertyMapEntry* pEntry, uno::Any& rAny ) { if ( !pEntry ) return; diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx index b64fd3ec96b6..e5e65dd7dcbf 100644 --- a/sc/source/ui/unoobj/condformatuno.cxx +++ b/sc/source/ui/unoobj/condformatuno.cxx @@ -562,7 +562,7 @@ void SAL_CALL ScCondFormatObj::setPropertyValue( SolarMutexGuard aGuard; const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -600,7 +600,7 @@ uno::Any SAL_CALL ScCondFormatObj::getPropertyValue( const OUString& aPropertyNa SolarMutexGuard aGuard; const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -702,7 +702,7 @@ void SAL_CALL ScConditionEntryObj::setPropertyValue( SolarMutexGuard aGuard; const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -765,7 +765,7 @@ uno::Any SAL_CALL ScConditionEntryObj::getPropertyValue( const OUString& aProper SolarMutexGuard aGuard; const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -909,7 +909,7 @@ void SAL_CALL ScColorScaleFormatObj::setPropertyValue( SolarMutexGuard aGuard; const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -943,7 +943,7 @@ uno::Any SAL_CALL ScColorScaleFormatObj::getPropertyValue( const OUString& aProp SolarMutexGuard aGuard; const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -1159,7 +1159,7 @@ void SAL_CALL ScDataBarFormatObj::setPropertyValue( SolarMutexGuard aGuard; const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -1283,7 +1283,7 @@ uno::Any SAL_CALL ScDataBarFormatObj::getPropertyValue( const OUString& aPropert SolarMutexGuard aGuard; const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -1534,7 +1534,7 @@ void SAL_CALL ScIconSetFormatObj::setPropertyValue( SolarMutexGuard aGuard; const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -1605,7 +1605,7 @@ uno::Any SAL_CALL ScIconSetFormatObj::getPropertyValue( const OUString& aPropert SolarMutexGuard aGuard; const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -1799,7 +1799,7 @@ void SAL_CALL ScCondDateFormatObj::setPropertyValue( SolarMutexGuard aGuard; const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -1841,7 +1841,7 @@ uno::Any SAL_CALL ScCondDateFormatObj::getPropertyValue( const OUString& aProper SolarMutexGuard aGuard; const SfxItemPropertyMap& rPropertyMap = maPropSet.getPropertyMap(); // from derived class - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index 22a98d6bd3eb..b09a5a004d2b 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -121,7 +121,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue( if ( !pDocShell ) throw uno::RuntimeException(); - const SfxItemPropertySimpleEntry* pEntry = aPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = aPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); if(!pEntry->nWID) @@ -203,7 +203,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const OUString& aPropertyN throw uno::RuntimeException(); uno::Any aRet; - const SfxItemPropertySimpleEntry* pEntry = aPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = aPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -248,7 +248,7 @@ beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const OUString if ( !pDocShell ) throw uno::RuntimeException(); - const SfxItemPropertySimpleEntry* pEntry = aPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = aPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -293,7 +293,7 @@ void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const OUString& aPropertyN if ( !pDocShell ) throw uno::RuntimeException(); - const SfxItemPropertySimpleEntry* pEntry = aPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = aPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -315,7 +315,7 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const OUString& aPropert if ( !pDocShell ) throw uno::RuntimeException(); - const SfxItemPropertySimpleEntry* pEntry = aPropertyMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = aPropertyMap.getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index dccfb6851492..a18508f21f4f 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -57,7 +57,7 @@ bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions, { //! use map (with new identifiers) - const SfxItemPropertySimpleEntry* pEntry = rPropMap.getByName(aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropMap.getByName(aPropertyName ); if( !pEntry || !pEntry->nWID ) return false; switch( pEntry->nWID ) @@ -132,7 +132,7 @@ uno::Any ScDocOptionsHelper::getPropertyValue( std::u16string_view aPropertyName ) { uno::Any aRet; - const SfxItemPropertySimpleEntry* pEntry = rPropMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = rPropMap.getByName( aPropertyName ); if( !pEntry || !pEntry->nWID ) return aRet; switch( pEntry->nWID ) diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index de1563ed8f58..46933ed8ab97 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -1120,12 +1120,12 @@ uno::Reference<container::XIndexReplace> ScStyleObj::CreateEmptyNumberingRules() // beans::XPropertyState const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( std::u16string_view rPropName, - const SfxItemPropertySimpleEntry*& rpResultEntry ) + const SfxItemPropertyMapEntry*& rpResultEntry ) { SfxStyleSheetBase* pStyle = GetStyle_Impl( true ); if ( pStyle ) { - const SfxItemPropertySimpleEntry* pEntry = nullptr; + const SfxItemPropertyMapEntry* pEntry = nullptr; if ( eFamily == SfxStyleFamily::Page ) { pEntry = lcl_GetHeaderStyleMap()->getByName( rPropName ); @@ -1157,7 +1157,7 @@ beans::PropertyState ScStyleObj::getPropertyState_Impl( std::u16string_view aPro { beans::PropertyState eRet = beans::PropertyState_DIRECT_VALUE; - const SfxItemPropertySimpleEntry* pResultEntry = nullptr; + const SfxItemPropertyMapEntry* pResultEntry = nullptr; const SfxItemSet* pItemSet = GetStyleItemSet_Impl( aPropertyName, pResultEntry ); if ( pItemSet && pResultEntry ) @@ -1215,7 +1215,7 @@ void SAL_CALL ScStyleObj::setPropertyToDefault( const OUString& aPropertyName ) SolarMutexGuard aGuard; GetStyle_Impl(); - const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = pPropSet->getPropertyMap().getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); @@ -1226,7 +1226,7 @@ uno::Any ScStyleObj::getPropertyDefault_Impl( std::u16string_view aPropertyName { uno::Any aAny; - const SfxItemPropertySimpleEntry* pResultEntry = nullptr; + const SfxItemPropertyMapEntry* pResultEntry = nullptr; const SfxItemSet* pStyleSet = GetStyleItemSet_Impl( aPropertyName, pResultEntry ); if ( pStyleSet && pResultEntry ) @@ -1340,7 +1340,7 @@ void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< OUString >& aP const SfxItemPropertyMap& rPropertyMap = pPropSet->getPropertyMap(); for ( sal_Int32 i = 0; i < aPropertyNames.getLength(); i++ ) { - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( pNames[i] ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( pNames[i] ); setPropertyValue_Impl( pNames[i], pEntry, &pValues[i] ); } } @@ -1434,7 +1434,7 @@ void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<OUString>& const SfxItemPropertyMap& rPropertyMap = pPropSet->getPropertyMap(); for ( const OUString& rName : aPropertyNames ) { - const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( rName ); + const SfxItemPropertyMapEntry* pEntry = rPropertyMap.getByName( rName ); setPropertyValue_Impl( rName, pEntry, nullptr ); } } @@ -1452,14 +1452,14 @@ void SAL_CALL ScStyleObj::setPropertyValue( const OUString& aPropertyName, const SolarMutexGuard aGuard; GetStyle_Impl(); - const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = pPropSet->getPropertyMap().getByName( aPropertyName ); if ( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); setPropertyValue_Impl( aPropertyName, pEntry, &aValue ); } -void ScStyleObj::setPropertyValue_Impl( std::u16string_view rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const uno::Any* pValue ) +void ScStyleObj::setPropertyValue_Impl( std::u16string_view rPropertyName, const SfxItemPropertyMapEntry* pEntry, const uno::Any* pValue ) { SfxStyleSheetBase* pStyle = GetStyle_Impl( true ); if ( !(pStyle && pEntry) ) @@ -1475,7 +1475,7 @@ void ScStyleObj::setPropertyValue_Impl( std::u16string_view rPropertyName, const { if(pEntry->nWID == SC_WID_UNO_HEADERSET) { - const SfxItemPropertySimpleEntry* pHeaderEntry = lcl_GetHeaderStyleMap()->getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pHeaderEntry = lcl_GetHeaderStyleMap()->getByName( rPropertyName ); if ( pHeaderEntry ) // only item-WIDs in header/footer map { SvxSetItem aNewHeader( rSet.Get(ATTR_PAGE_HEADERSET) ); @@ -1489,7 +1489,7 @@ void ScStyleObj::setPropertyValue_Impl( std::u16string_view rPropertyName, const } else if(pEntry->nWID == SC_WID_UNO_FOOTERSET) { - const SfxItemPropertySimpleEntry* pFooterEntry = lcl_GetFooterStyleMap()->getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pFooterEntry = lcl_GetFooterStyleMap()->getByName( rPropertyName ); if ( pFooterEntry ) // only item-WIDs in header/footer map { SvxSetItem aNewFooter( rSet.Get(ATTR_PAGE_FOOTERSET) ); @@ -1780,7 +1780,7 @@ uno::Any ScStyleObj::getPropertyValue_Impl( std::u16string_view aPropertyName ) } else { - const SfxItemPropertySimpleEntry* pResultEntry = nullptr; + const SfxItemPropertyMapEntry* pResultEntry = nullptr; const SfxItemSet* pItemSet = GetStyleItemSet_Impl( aPropertyName, pResultEntry ); if ( pItemSet && pResultEntry ) diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 0d2ae5bd744e..346e784f0836 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -52,7 +52,7 @@ using namespace com::sun::star; static const SvxItemPropertySet * lcl_GetHdFtPropertySet() { static const SvxItemPropertySet aHdFtPropertySet_Impl = [] { - SfxItemPropertyMapEntry aHdFtPropertyMap_Impl[] = + static SfxItemPropertyMapEntry aHdFtPropertyMap_Impl[] = { SVX_UNOEDIT_CHAR_PROPERTIES, SVX_UNOEDIT_FONT_PROPERTIES, @@ -65,7 +65,7 @@ static const SvxItemPropertySet * lcl_GetHdFtPropertySet() // (headers/footers are in twips) SfxItemPropertyMapEntry* pEntry = aHdFtPropertyMap_Impl; - while (!pEntry->aName.empty()) + while (!pEntry->aName.isEmpty()) { if ( ( pEntry->nWID == EE_CHAR_FONTHEIGHT || pEntry->nWID == EE_CHAR_FONTHEIGHT_CJK || diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 048e663d81ad..73363238a85a 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -1252,14 +1252,14 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, bool bCursor const SfxPoolItem* pItem = nullptr; if ( rNewSet.GetItemState( nWhich, true, &pItem ) == SfxItemState::SET && pItem ) { - for ( const auto& rProp : rMap.getPropertyEntries()) + for ( const auto pEntry : rMap.getPropertyEntries()) { - if ( rProp.second.nWID == nWhich ) + if ( pEntry->nWID == nWhich ) { css::uno::Any aVal; - pItem->QueryValue( aVal, rProp.second.nMemberId ); + pItem->QueryValue( aVal, pEntry->nMemberId ); aProperties.realloc( nCount + 1 ); - aProperties[ nCount ].Name = rProp.first; + aProperties[ nCount ].Name = pEntry->aName; aProperties[ nCount ].Value = aVal; ++nCount; } diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index e0eced36a280..c0dd967e3120 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -40,6 +40,7 @@ class ModifyListenerForwarder; struct SfxItemPropertySimpleEntry; +struct SfxItemPropertyMapEntry; typedef cppu::ImplInheritanceHelper< SfxUnoStyleSheet, css::beans::XPropertySet, @@ -128,7 +129,7 @@ public: private: /// @throws css::uno::RuntimeException - static const SfxItemPropertySimpleEntry* getPropertyMapEntry( std::u16string_view rPropertyName ); + static const SfxItemPropertyMapEntry* getPropertyMapEntry( std::u16string_view rPropertyName ); virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; virtual ~SdStyleSheet() override; diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index a470ff28c4f1..dbf164e41235 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -961,7 +961,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con SolarMutexGuard aGuard; throwIfDisposed(); - const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = getPropertyMapEntry( aPropertyName ); if( pEntry == nullptr ) { throw UnknownPropertyException( aPropertyName, static_cast<cppu::OWeakObject*>(this)); @@ -1047,7 +1047,7 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) throwIfDisposed(); - const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( PropertyName ); + const SfxItemPropertyMapEntry* pEntry = getPropertyMapEntry( PropertyName ); if( pEntry == nullptr ) { throw UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this)); @@ -1159,7 +1159,7 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN throwIfDisposed(); - const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( PropertyName ); + const SfxItemPropertyMapEntry* pEntry = getPropertyMapEntry( PropertyName ); if( pEntry == nullptr ) throw UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this)); @@ -1252,7 +1252,7 @@ void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName ) throwIfDisposed(); - const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( PropertyName ); + const SfxItemPropertyMapEntry* pEntry = getPropertyMapEntry( PropertyName ); if( pEntry == nullptr ) throw UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this)); @@ -1276,7 +1276,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) throwIfDisposed(); - const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = getPropertyMapEntry( aPropertyName ); if( pEntry == nullptr ) throw UnknownPropertyException( aPropertyName, static_cast<cppu::OWeakObject*>(this)); Any aRet; @@ -1303,7 +1303,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) } /** this is used because our property map is not sorted yet */ -const SfxItemPropertySimpleEntry* SdStyleSheet::getPropertyMapEntry( std::u16string_view rPropertyName ) +const SfxItemPropertyMapEntry* SdStyleSheet::getPropertyMapEntry( std::u16string_view rPropertyName ) { return GetStylePropertySet().getPropertyMapEntry(rPropertyName); } diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx index 41384cf08371..13a4cd4dd258 100644 --- a/sd/source/ui/inc/unokywds.hxx +++ b/sd/source/ui/inc/unokywds.hxx @@ -44,20 +44,21 @@ inline constexpr OUStringLiteral sUNO_Service_ImageMapPolygonObject = u"com.sun.star.image.ImageMapPolygonObject"; // properties -inline const char16_t sUNO_Prop_ForbiddenCharacters[] = u"ForbiddenCharacters"; -inline const char16_t sUNO_Prop_MapUnit[] = u"MapUnit"; -inline const char16_t sUNO_Prop_VisibleArea[] = u"VisibleArea"; -inline const char16_t sUNO_Prop_TabStop[] = u"TabStop"; -inline const char16_t sUNO_Prop_CharLocale[] = u"CharLocale"; -inline const char16_t sUNO_Prop_AutomContFocus[] = u"AutomaticControlFocus"; -inline const char16_t sUNO_Prop_ApplyFrmDsgnMode[] = u"ApplyFormDesignMode"; -inline const char16_t sUNO_Prop_IsBackgroundVisible[] = u"IsBackgroundVisible"; -inline const char16_t sUNO_Prop_IsBackgroundObjectsVisible[] = u"IsBackgroundObjectsVisible"; -inline const char16_t sUNO_Prop_UserDefinedAttributes[] = u"UserDefinedAttributes"; -inline const char16_t sUNO_Prop_BookmarkURL[] = u"BookmarkURL"; -inline const char16_t sUNO_Prop_RuntimeUID[] = u"RuntimeUID"; -inline const char16_t sUNO_Prop_HasValidSignatures[] = u"HasValidSignatures"; -inline const char16_t sUNO_Prop_InteropGrabBag[] = u"InteropGrabBag"; +inline constexpr OUStringLiteral sUNO_Prop_ForbiddenCharacters = u"ForbiddenCharacters"; +inline constexpr OUStringLiteral sUNO_Prop_MapUnit = u"MapUnit"; +inline constexpr OUStringLiteral sUNO_Prop_VisibleArea = u"VisibleArea"; +inline constexpr OUStringLiteral sUNO_Prop_TabStop = u"TabStop"; +inline constexpr OUStringLiteral sUNO_Prop_CharLocale = u"CharLocale"; +inline constexpr OUStringLiteral sUNO_Prop_AutomContFocus = u"AutomaticControlFocus"; +inline constexpr OUStringLiteral sUNO_Prop_ApplyFrmDsgnMode = u"ApplyFormDesignMode"; +inline constexpr OUStringLiteral sUNO_Prop_IsBackgroundVisible = u"IsBackgroundVisible"; +inline constexpr OUStringLiteral sUNO_Prop_IsBackgroundObjectsVisible + = u"IsBackgroundObjectsVisible"; +inline constexpr OUStringLiteral sUNO_Prop_UserDefinedAttributes = u"UserDefinedAttributes"; +inline constexpr OUStringLiteral sUNO_Prop_BookmarkURL = u"BookmarkURL"; +inline constexpr OUStringLiteral sUNO_Prop_RuntimeUID = u"RuntimeUID"; +inline constexpr OUStringLiteral sUNO_Prop_HasValidSignatures = u"HasValidSignatures"; +inline constexpr OUStringLiteral sUNO_Prop_InteropGrabBag = u"InteropGrabBag"; // view settings inline constexpr OUStringLiteral sUNO_View_ViewId = u"ViewId"; diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 8873162436be..e9917f16b467 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -264,7 +264,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const sd::PresentationSettings& rPresSettings = mpDoc->getPresentationSettings(); - const SfxItemPropertySimpleEntry* pEntry = maPropSet.getPropertyMapEntry(aPropertyName); + const SfxItemPropertyMapEntry* pEntry = maPropSet.getPropertyMapEntry(aPropertyName); if( pEntry && ((pEntry->nFlags & PropertyAttribute::READONLY) != 0) ) throw PropertyVetoException(); @@ -526,7 +526,7 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) const sd::PresentationSettings& rPresSettings = mpDoc->getPresentationSettings(); - const SfxItemPropertySimpleEntry* pEntry = maPropSet.getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pEntry = maPropSet.getPropertyMapEntry(PropertyName); switch( pEntry ? pEntry->nWID : -1 ) { diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index dff010b3722e..dabcd24f0af2 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -120,7 +120,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un if(pLayer == nullptr || mxLayerManager == nullptr) throw lang::DisposedException(); - const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMapEntry(aPropertyName); + const SfxItemPropertyMapEntry* pEntry = pPropSet->getPropertyMapEntry(aPropertyName); switch( pEntry ? pEntry->nWID : -1 ) { @@ -188,7 +188,7 @@ uno::Any SAL_CALL SdLayer::getPropertyValue( const OUString& PropertyName ) if(pLayer == nullptr || mxLayerManager == nullptr) throw lang::DisposedException(); - const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pEntry = pPropSet->getPropertyMapEntry(PropertyName); uno::Any aValue; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index fcdb050d7843..cb3569a7689d 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1188,7 +1188,7 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyNam if( nullptr == mpDoc ) throw lang::DisposedException(); - const SfxItemPropertySimpleEntry* pEntry = mpPropSet->getPropertyMapEntry(aPropertyName); + const SfxItemPropertyMapEntry* pEntry = mpPropSet->getPropertyMapEntry(aPropertyName); switch( pEntry ? pEntry->nWID : -1 ) { @@ -1270,7 +1270,7 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property if( nullptr == mpDoc ) throw lang::DisposedException(); - const SfxItemPropertySimpleEntry* pEntry = mpPropSet->getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pEntry = mpPropSet->getPropertyMapEntry(PropertyName); switch( pEntry ? pEntry->nWID : -1 ) { diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index fdedfb6dcc35..e9e017de3f8d 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -415,7 +415,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const c { SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pEntry = mpPropSet->getPropertyMapEntry(aPropertyName); + const SfxItemPropertyMapEntry* pEntry = mpPropSet->getPropertyMapEntry(aPropertyName); if( pEntry ) { @@ -656,7 +656,7 @@ css::uno::Any SAL_CALL SdXShape::getPropertyValue( const OUString& PropertyName uno::Any aRet; - const SfxItemPropertySimpleEntry* pEntry = mpPropSet->getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pEntry = mpPropSet->getPropertyMapEntry(PropertyName); if( pEntry && mpShape->GetSdrObject() ) { diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 02bd803cdeb9..eed82fceddd8 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -582,7 +582,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName throwIfDisposed(); - const SfxItemPropertySimpleEntry* pEntry = mpPropSet->getPropertyMapEntry(aPropertyName); + const SfxItemPropertyMapEntry* pEntry = mpPropSet->getPropertyMapEntry(aPropertyName); switch( pEntry ? pEntry->nWID : -1 ) { @@ -992,7 +992,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) uno::Any aAny; - const SfxItemPropertySimpleEntry* pEntry = mpPropSet->getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pEntry = mpPropSet->getPropertyMapEntry(PropertyName); sal_Int16 nEntry = pEntry ? pEntry->nWID : -1; switch (nEntry) @@ -2780,14 +2780,15 @@ void SdMasterPage::setBackground( const Any& rValue ) Reference< beans::XPropertySetInfo > xSetInfo( xInputSet->getPropertySetInfo(), UNO_SET_THROW ); Reference< beans::XPropertyState > xSetStates( xInputSet, UNO_QUERY ); - for( const auto& rProp : ImplGetPageBackgroundPropertySet()->getPropertyMap().getPropertyEntries() ) + for( const auto pProp : ImplGetPageBackgroundPropertySet()->getPropertyMap().getPropertyEntries() ) { - if( xSetInfo->hasPropertyByName( OUString(rProp.first) ) ) + const OUString& rPropName = pProp->aName; + if( xSetInfo->hasPropertyByName( rPropName ) ) { - if( !xSetStates.is() || xSetStates->getPropertyState( OUString(rProp.first) ) == beans::PropertyState_DIRECT_VALUE ) - xStyleSet->setPropertyValue( OUString(rProp.first), xInputSet->getPropertyValue( OUString(rProp.first) ) ); + if( !xSetStates.is() || xSetStates->getPropertyState( rPropName ) == beans::PropertyState_DIRECT_VALUE ) + xStyleSet->setPropertyValue( rPropName, xInputSet->getPropertyValue( rPropName ) ); else - xSetStates->setPropertyToDefault( OUString(rProp.first) ); + xSetStates->setPropertyToDefault( rPropName ); } } } diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 60a1ac6bbe14..88ff72ef92a8 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -100,24 +100,24 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) if( mpPropSet->AreThereOwnUsrAnys() ) { - for( const auto& rProp : mpPropSet->getPropertyMap().getPropertyEntries() ) + for( const auto pProp : mpPropSet->getPropertyMap().getPropertyEntries() ) { - uno::Any* pAny = mpPropSet->GetUsrAnyForID( rProp.second ); + uno::Any* pAny = mpPropSet->GetUsrAnyForID( *pProp ); if( pAny ) { - OUString aPropertyName( rProp.first ); - switch( rProp.second.nWID ) + const OUString & aPropertyName = pProp->aName; + switch( pProp->nWID ) { case XATTR_FILLFLOATTRANSPARENCE : case XATTR_FILLGRADIENT : { if ( ( pAny->getValueType() == ::cppu::UnoType< css::awt::Gradient>::get() ) - && ( rProp.second.nMemberId == MID_FILLGRADIENT ) ) + && ( pProp->nMemberId == MID_FILLGRADIENT ) ) { setPropertyValue( aPropertyName, *pAny ); } else if ( ( pAny->getValueType() == ::cppu::UnoType<OUString>::get() ) && - ( rProp.second.nMemberId == MID_NAME ) ) + ( pProp->nMemberId == MID_NAME ) ) { setPropertyValue( aPropertyName, *pAny ); } @@ -126,12 +126,12 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) case XATTR_FILLHATCH : { if ( ( pAny->getValueType() == ::cppu::UnoType< css::drawing::Hatch>::get() ) - && ( rProp.second.nMemberId == MID_FILLHATCH ) ) + && ( pProp->nMemberId == MID_FILLHATCH ) ) { setPropertyValue( aPropertyName, *pAny ); } else if ( ( pAny->getValueType() == ::cppu::UnoType<OUString>::get() ) && - ( rProp.second.nMemberId == MID_NAME ) ) + ( pProp->nMemberId == MID_NAME ) ) { setPropertyValue( aPropertyName, *pAny ); } @@ -139,13 +139,13 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) break; case XATTR_FILLBITMAP : { - if (rProp.second.nMemberId == MID_BITMAP && + if (pProp->nMemberId == MID_BITMAP && (pAny->getValueType() == cppu::UnoType<css::awt::XBitmap>::get() || pAny->getValueType() == cppu::UnoType<css::graphic::XGraphic>::get())) { setPropertyValue( aPropertyName, *pAny ); } - else if (pAny->getValueType() == ::cppu::UnoType<OUString>::get() && rProp.second.nMemberId == MID_NAME) + else if (pAny->getValueType() == ::cppu::UnoType<OUString>::get() && pProp->nMemberId == MID_NAME) { setPropertyValue( aPropertyName, *pAny ); } @@ -189,7 +189,7 @@ void SAL_CALL SdUnoPageBackground::setPropertyValue( const OUString& aPropertyNa { SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = getPropertyMapEntry( aPropertyName ); if( pEntry == nullptr ) { @@ -244,7 +244,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& Propert SolarMutexGuard aGuard; uno::Any aAny; - const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pEntry = getPropertyMapEntry(PropertyName); if( pEntry == nullptr ) { @@ -299,7 +299,7 @@ beans::PropertyState SAL_CALL SdUnoPageBackground::getPropertyState( const OUStr { SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pEntry = getPropertyMapEntry(PropertyName); if( pEntry == nullptr ) throw beans::UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this)); @@ -359,7 +359,7 @@ void SAL_CALL SdUnoPageBackground::setPropertyToDefault( const OUString& Propert { SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pEntry = getPropertyMapEntry(PropertyName); if( pEntry == nullptr ) throw beans::UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this)); @@ -382,7 +382,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyDefault( const OUString& aProp { SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry(aPropertyName); + const SfxItemPropertyMapEntry* pEntry = getPropertyMapEntry(aPropertyName); if( pEntry == nullptr || mpSet == nullptr ) throw beans::UnknownPropertyException( aPropertyName, static_cast<cppu::OWeakObject*>(this)); @@ -403,7 +403,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyDefault( const OUString& aProp } /** this is used because our property map is not sorted yet */ -const SfxItemPropertySimpleEntry* SdUnoPageBackground::getPropertyMapEntry( std::u16string_view rPropertyName ) const throw() +const SfxItemPropertyMapEntry* SdUnoPageBackground::getPropertyMapEntry( std::u16string_view rPropertyName ) const throw() { return mpPropSet->getPropertyMap().getByName(rPropertyName); } diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx index 3ff00d383c1f..4713de8bffc0 100644 --- a/sd/source/ui/unoidl/unopback.hxx +++ b/sd/source/ui/unoidl/unopback.hxx @@ -36,7 +36,7 @@ class SdDrawDocument; class SdrModel; class SfxItemSet; class SvxItemPropertySet; -struct SfxItemPropertySimpleEntry; +struct SfxItemPropertyMapEntry; const SvxItemPropertySet* ImplGetPageBackgroundPropertySet(); @@ -51,7 +51,7 @@ class SdUnoPageBackground final : public ::cppu::WeakImplHelper< std::unique_ptr<SfxItemSet> mpSet; SdrModel* mpDoc; - const SfxItemPropertySimpleEntry* getPropertyMapEntry( std::u16string_view rPropertyName ) const throw(); + const SfxItemPropertyMapEntry* getPropertyMapEntry( std::u16string_view rPropertyName ) const throw(); public: SdUnoPageBackground( SdDrawDocument* pDoc = nullptr, const SfxItemSet* pSet = nullptr); virtual ~SdUnoPageBackground() throw() override; diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 3afda2d5d646..653c7c4e3a02 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -689,7 +689,7 @@ void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const OUString& aP { SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pEntry = mpPropSet->getPropertyMapEntry(aPropertyName); + const SfxItemPropertyMapEntry* pEntry = mpPropSet->getPropertyMapEntry(aPropertyName); bool bOk = false; @@ -718,7 +718,7 @@ uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const OUString uno::Any aAny; - const SfxItemPropertySimpleEntry* pEntry = mpPropSet->getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pEntry = mpPropSet->getPropertyMapEntry(PropertyName); switch( pEntry ? pEntry->nWID : -1 ) { diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index e37607c91a46..eff4588b3b5f 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -238,7 +238,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL IFrameObject::getPropertySetI void SAL_CALL IFrameObject::setPropertyValue(const OUString& aPropertyName, const uno::Any& aAny) { - const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = maPropMap.getByName( aPropertyName ); if( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); switch( pEntry->nWID ) @@ -318,7 +318,7 @@ void SAL_CALL IFrameObject::setPropertyValue(const OUString& aPropertyName, cons uno::Any SAL_CALL IFrameObject::getPropertyValue(const OUString& aPropertyName) { - const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName ); + const SfxItemPropertyMapEntry* pEntry = maPropMap.getByName( aPropertyName ); if( !pEntry ) throw beans::UnknownPropertyException(aPropertyName); uno::Any aAny; diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index 57e44a7f861a..c7ac3eb6400c 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -37,9 +37,10 @@ using namespace com::sun::star::uno; SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries ) { - while( !pEntries->aName.empty() ) + m_aMap.reserve(128); + while( !pEntries->aName.isEmpty() ) { - m_aMap.emplace( pEntries->aName, *pEntries ); + m_aMap.insert( pEntries ); ++pEntries; } } @@ -50,12 +51,23 @@ SfxItemPropertyMap::~SfxItemPropertyMap() { } -const SfxItemPropertySimpleEntry* SfxItemPropertyMap::getByName( std::u16string_view rName ) const +const SfxItemPropertyMapEntry* SfxItemPropertyMap::getByName( std::u16string_view rName ) const { - auto aIter = m_aMap.find(rName); - if( aIter == m_aMap.end() ) + struct Compare + { + bool operator() ( const SfxItemPropertyMapEntry* lhs, std::u16string_view rhs ) const + { + return lhs->aName < rhs; + } + bool operator() ( std::u16string_view lhs, const SfxItemPropertyMapEntry* rhs ) const + { + return lhs < rhs->aName; + } + }; + auto it = std::lower_bound(m_aMap.begin(), m_aMap.end(), rName, Compare()); + if (it == m_aMap.end() || Compare()(rName, *it)) return nullptr; - return &aIter->second; + return *it; } uno::Sequence<beans::Property> const & SfxItemPropertyMap::getProperties() const @@ -65,10 +77,9 @@ uno::Sequence<beans::Property> const & SfxItemPropertyMap::getProperties() const m_aPropSeq.realloc( m_aMap.size() ); beans::Property* pPropArray = m_aPropSeq.getArray(); sal_uInt32 n = 0; - for( const auto& rPair : m_aMap ) + for( const SfxItemPropertyMapEntry* pEntry : m_aMap ) { - const SfxItemPropertySimpleEntry* pEntry = &rPair.second; - pPropArray[n].Name = rPair.first; + pPropArray[n].Name = pEntry->aName; pPropArray[n].Handle = pEntry->nWID; pPropArray[n].Type = pEntry->aType; pPropArray[n].Attributes = @@ -80,12 +91,11 @@ uno::Sequence<beans::Property> const & SfxItemPropertyMap::getProperties() const return m_aPropSeq; } -beans::Property SfxItemPropertyMap::getPropertyByName( const OUString & rName ) const +beans::Property SfxItemPropertyMap::getPropertyByName( const OUString& rName ) const { - auto aIter = m_aMap.find(rName); - if( aIter == m_aMap.end() ) + const SfxItemPropertyMapEntry* pEntry = getByName(rName); + if( !pEntry ) throw UnknownPropertyException(rName); - const SfxItemPropertySimpleEntry* pEntry = &aIter->second; beans::Property aProp; aProp.Name = rName; aProp.Handle = pEntry->nWID; @@ -96,20 +106,7 @@ beans::Property SfxItemPropertyMap::getPropertyByName( const OUString & rName ) bool SfxItemPropertyMap::hasPropertyByName( std::u16string_view rName ) const { - auto aIter = m_aMap.find(rName); - return aIter != m_aMap.end(); -} - -void SfxItemPropertyMap::mergeProperties( const uno::Sequence< beans::Property >& rPropSeq ) -{ - for( const beans::Property& rProp : rPropSeq ) - { - SfxItemPropertySimpleEntry aTemp( - sal::static_int_cast< sal_Int16 >( rProp.Handle ), //nWID - rProp.Type, //aType - rProp.Attributes); //nFlags - m_aMap[rProp.Name] = aTemp; - } + return getByName(rName) != nullptr; } sal_uInt32 SfxItemPropertyMap::getSize() const @@ -121,7 +118,7 @@ SfxItemPropertySet::~SfxItemPropertySet() { } -void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEntry, +void SfxItemPropertySet::getPropertyValue( const SfxItemPropertyMapEntry& rEntry, const SfxItemSet& rSet, Any& rAny ) const { // get the SfxPoolItem @@ -153,7 +150,7 @@ void SfxItemPropertySet::getPropertyValue( const OUString &rName, const SfxItemSet& rSet, Any& rAny ) const { // detect which-id - const SfxItemPropertySimpleEntry* pEntry = m_aMap.getByName( rName ); + const SfxItemPropertyMapEntry* pEntry = m_aMap.getByName( rName ); if ( !pEntry ) throw UnknownPropertyException(rName); getPropertyValue( *pEntry,rSet, rAny ); @@ -167,7 +164,7 @@ Any SfxItemPropertySet::getPropertyValue( const OUString &rName, return aVal; } -void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEntry, +void SfxItemPropertySet::setPropertyValue( const SfxItemPropertyMapEntry& rEntry, const Any& aVal, SfxItemSet& rSet ) const { @@ -196,7 +193,7 @@ void SfxItemPropertySet::setPropertyValue( const OUString &rName, const Any& aVal, SfxItemSet& rSet ) const { - const SfxItemPropertySimpleEntry* pEntry = m_aMap.getByName( rName ); + const SfxItemPropertyMapEntry* pEntry = m_aMap.getByName( rName ); if ( !pEntry ) { throw UnknownPropertyException(rName); @@ -204,7 +201,7 @@ void SfxItemPropertySet::setPropertyValue( const OUString &rName, setPropertyValue(*pEntry, aVal, rSet); } -PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet) const +PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertyMapEntry& rEntry, const SfxItemSet& rSet) const throw() { PropertyState eRet = PropertyState_DIRECT_VALUE; @@ -225,7 +222,7 @@ PropertyState SfxItemPropertySet::getPropertyState(const OUString& rName, cons PropertyState eRet = PropertyState_DIRECT_VALUE; // Get WhichId - const SfxItemPropertySimpleEntry* pEntry = m_aMap.getByName( rName ); + const SfxItemPropertyMapEntry* pEntry = m_aMap.getByName( rName ); if( !pEntry || !pEntry->nWID ) { throw UnknownPropertyException(rName); @@ -278,11 +275,22 @@ sal_Bool SAL_CALL SfxItemPropertySetInfo::hasPropertyByName( const OUString& rNa return m_aOwnMap.hasPropertyByName( rName ); } -SfxExtItemPropertySetInfo::SfxExtItemPropertySetInfo( const SfxItemPropertyMapEntry *pMap, +SfxExtItemPropertySetInfo::SfxExtItemPropertySetInfo( const SfxItemPropertyMapEntry *pEntries, const Sequence<Property>& rPropSeq ) - : aExtMap( pMap ) { - aExtMap.mergeProperties( rPropSeq ); + while( !pEntries->aName.isEmpty() ) + { + maMap.emplace( pEntries->aName, *pEntries ); + ++pEntries; + } + for( const auto & rProp : rPropSeq ) + { + SfxItemPropertySimpleEntry aTemp( + sal::static_int_cast< sal_Int16 >( rProp.Handle ), //nWID + rProp.Type, //aType + rProp.Attributes); //nFlags + maMap[rProp.Name] = aTemp; + } } SfxExtItemPropertySetInfo::~SfxExtItemPropertySetInfo() @@ -291,17 +299,43 @@ SfxExtItemPropertySetInfo::~SfxExtItemPropertySetInfo() Sequence< Property > SAL_CALL SfxExtItemPropertySetInfo::getProperties( ) { - return aExtMap.getProperties(); + if( !m_aPropSeq.hasElements() ) + { + m_aPropSeq.realloc( maMap.size() ); + beans::Property* pPropArray = m_aPropSeq.getArray(); + sal_uInt32 n = 0; + for( const auto& rPair : maMap ) + { + const SfxItemPropertySimpleEntry& rEntry = rPair.second; + pPropArray[n].Name = rPair.first; + pPropArray[n].Handle = rEntry.nWID; + pPropArray[n].Type = rEntry.aType; + pPropArray[n].Attributes = + sal::static_int_cast< sal_Int16 >(rEntry.nFlags); + n++; + } + } + + return m_aPropSeq; } Property SAL_CALL SfxExtItemPropertySetInfo::getPropertyByName( const OUString& rPropertyName ) { - return aExtMap.getPropertyByName( rPropertyName ); + auto aIter = maMap.find(rPropertyName); + if( aIter == maMap.end() ) + throw UnknownPropertyException(rPropertyName); + const SfxItemPropertySimpleEntry& rEntry = aIter->second; + beans::Property aProp; + aProp.Name = rPropertyName; + aProp.Handle = rEntry.nWID; + aProp.Type = rEntry.aType; + aProp.Attributes = sal::static_int_cast< sal_Int16 >(rEntry.nFlags); + return aProp; } sal_Bool SAL_CALL SfxExtItemPropertySetInfo::hasPropertyByName( const OUString& rPropertyName ) { - return aExtMap.hasPropertyByName( rPropertyName ); + return maMap.find(rPropertyName) != maMap.end(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx index 688eebf94cca..94d0cf4a98cb 100644 --- a/svx/source/inc/cell.hxx +++ b/svx/source/inc/cell.hxx @@ -185,7 +185,7 @@ protected: SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet() override; SVX_DLLPRIVATE void SetObjectItem(const SfxPoolItem& rItem); - SVX_DLLPRIVATE static css::uno::Any GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap ); + SVX_DLLPRIVATE static css::uno::Any GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertyMapEntry* pMap ); private: /// @throws css::uno::RuntimeException diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 06c9fda21a39..c42db7cfd7d8 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -995,7 +995,7 @@ sal_Int32 SAL_CALL Cell::getError( ) // XPropertySet -Any Cell::GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap ) +Any Cell::GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertyMapEntry* pMap ) { Any aAny( SvxItemPropertySet_getPropertyValue( pMap, aSet ) ); @@ -1030,7 +1030,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& if(mpProperties == nullptr) throw DisposedException(); - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(rPropertyName); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry(rPropertyName); if( pMap ) { if( (pMap->nFlags & PropertyAttribute::READONLY ) != 0 ) @@ -1183,7 +1183,7 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) if(mpProperties == nullptr) throw DisposedException(); - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); if( pMap ) { switch( pMap->nWID ) @@ -1374,7 +1374,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) if(mpProperties == nullptr) throw DisposedException(); - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); if( pMap ) { @@ -1503,7 +1503,7 @@ void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) if(mpProperties == nullptr) throw DisposedException(); - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); if( pMap ) { switch( pMap->nWID ) @@ -1544,7 +1544,7 @@ Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) if(mpProperties == nullptr) throw DisposedException(); - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(aPropertyName); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry(aPropertyName); if( pMap ) { switch( pMap->nWID ) diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index a1a4e6963020..b2abe9f074aa 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -32,8 +32,8 @@ class SvxPluginShape : public SvxOle2Shape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; public: explicit SvxPluginShape(SdrObject* pObj); @@ -50,8 +50,8 @@ class SvxAppletShape : public SvxOle2Shape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; public: explicit SvxAppletShape(SdrObject* pObj); @@ -68,8 +68,8 @@ class SvxFrameShape : public SvxOle2Shape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl(const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue) override; public: @@ -89,8 +89,8 @@ class SvxTableShape : public SvxShape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override; virtual void lock() override; virtual void unlock() override; diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index 8a2fc64aac4e..31bf7d756b45 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -47,7 +47,7 @@ SvxTableShape::~SvxTableShape() throw() bool SvxTableShape::setPropertyValueImpl( const OUString& rName, - const SfxItemPropertySimpleEntry* pProperty, + const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) @@ -99,7 +99,7 @@ bool SvxTableShape::setPropertyValueImpl( bool SvxTableShape::getPropertyValueImpl( const OUString& rName, - const SfxItemPropertySimpleEntry* pProperty, + const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 56d1c1569479..bf339a0930d1 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -897,7 +897,7 @@ SvxShapePolyPolygon::~SvxShapePolyPolygon() throw() { } -bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1009,7 +1009,7 @@ bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const Sfx throw lang::IllegalArgumentException(); } -bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, +bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) @@ -1169,7 +1169,7 @@ SvxGraphicObject::~SvxGraphicObject() throw() { } -bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { bool bOk = false; switch( pProperty->nWID ) @@ -1403,7 +1403,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte return true; } -bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) +bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -1755,7 +1755,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c } } -bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) +bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index f2f29c21fc36..10a9c398f02c 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -241,7 +241,7 @@ struct ImpRememberTransAndRect } -bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -351,7 +351,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte } -bool Svx3DSceneObject::getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, +bool Svx3DSceneObject::getPropertyValueImpl(const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue) { switch( pProperty->nWID ) @@ -412,7 +412,7 @@ Svx3DCubeObject::~Svx3DCubeObject() throw() { } -bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { SolarMutexGuard aGuard; @@ -467,7 +467,7 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem throw IllegalArgumentException(); } -bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) +bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -533,7 +533,7 @@ Svx3DSphereObject::~Svx3DSphereObject() throw() { } -bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -577,7 +577,7 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt throw IllegalArgumentException(); } -bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) +bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -726,7 +726,7 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon& rValue <<= aRetval; } -bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -772,7 +772,7 @@ bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxIte throw IllegalArgumentException(); } -bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) +bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -818,7 +818,7 @@ Svx3DExtrudeObject::~Svx3DExtrudeObject() throw() { } -bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -853,7 +853,7 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI throw IllegalArgumentException(); } -bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) +bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -901,7 +901,7 @@ Svx3DPolygonObject::~Svx3DPolygonObject() throw() { } -bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -974,7 +974,7 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI throw IllegalArgumentException(); } -bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) +bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 17daf3f5a1ed..f1099f2c150f 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -78,7 +78,7 @@ SvxOle2Shape::~SvxOle2Shape() throw() } //XPropertySet -bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -196,7 +196,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPro throw IllegalArgumentException(); } -bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) +bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -578,7 +578,7 @@ void SAL_CALL SvxAppletShape::setPropertyValues( const css::uno::Sequence< OUStr resetModifiedState(); } -bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) ) { @@ -599,7 +599,7 @@ bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemP } } -bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) +bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) ) { @@ -649,7 +649,7 @@ void SAL_CALL SvxPluginShape::setPropertyValues( const css::uno::Sequence< OUStr resetModifiedState(); } -bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) ) { @@ -670,7 +670,7 @@ bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemP } } -bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) +bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) ) { @@ -721,7 +721,7 @@ void SAL_CALL SvxFrameShape::setPropertyValues( const css::uno::Sequence< OUStri resetModifiedState(); } -bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { if( (pProperty->nWID >= OWN_ATTR_FRAME_URL) && (pProperty->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT) ) { @@ -742,7 +742,7 @@ bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr } } -bool SvxFrameShape::getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, +bool SvxFrameShape::getPropertyValueImpl(const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue) { if( (pProperty->nWID >= OWN_ATTR_FRAME_URL) && (pProperty->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT) ) @@ -775,7 +775,7 @@ SvxMediaShape::~SvxMediaShape() throw() } -bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { if( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM)) || (pProperty->nWID == OWN_ATTR_MEDIA_STREAM) @@ -931,7 +931,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr } -bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) +bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { if ( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM)) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index e645738d7a3b..a111ea46be04 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -592,24 +592,24 @@ static void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemProper const SfxItemPropertyMap& rSrc = rPropSet.getPropertyMap(); - for(const auto& rSrcProp : rSrc.getPropertyEntries()) + for(const SfxItemPropertyMapEntry* pSrcProp : rSrc.getPropertyEntries()) { - const sal_uInt16 nWID = rSrcProp.second.nWID; + const sal_uInt16 nWID = pSrcProp->nWID; if(SfxItemPool::IsWhich(nWID) && (nWID < OWN_ATTR_VALUE_START || nWID > OWN_ATTR_VALUE_END) - && rPropSet.GetUsrAnyForID(rSrcProp.second)) + && rPropSet.GetUsrAnyForID(*pSrcProp)) rSet.Put(rSet.GetPool()->GetDefaultItem(nWID)); } - for(const auto& rSrcProp : rSrc.getPropertyEntries()) + for(const SfxItemPropertyMapEntry* pSrcProp : rSrc.getPropertyEntries()) { - if(rSrcProp.second.nWID) + if(pSrcProp->nWID) { - uno::Any* pUsrAny = rPropSet.GetUsrAnyForID(rSrcProp.second); + uno::Any* pUsrAny = rPropSet.GetUsrAnyForID(*pSrcProp); if(pUsrAny) { // search for equivalent entry in pDst - const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( rSrcProp.first ); + const SfxItemPropertyMapEntry* pEntry = pMap->getByName( pSrcProp->aName ); if(pEntry) { // entry found @@ -617,7 +617,7 @@ static void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemProper { // special ID in PropertySet, can only be set // directly at the object - xSet->setPropertyValue( OUString(rSrcProp.first), *pUsrAny); + xSet->setPropertyValue( pSrcProp->aName, *pUsrAny); } else { @@ -1588,7 +1588,7 @@ void SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& { ::SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(rPropertyName); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry(rPropertyName); if (!HasSdrObject()) { @@ -1731,7 +1731,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) { ::SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); uno::Any aAny; if(HasSdrObject()) @@ -1896,7 +1896,7 @@ void SAL_CALL SvxShape::firePropertiesChangeEvent( const css::uno::Sequence< OUS } -uno::Any SvxShape::GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap ) const +uno::Any SvxShape::GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertyMapEntry* pMap ) const { DBG_TESTSOLARMUTEX(); uno::Any aAny; @@ -1995,7 +1995,7 @@ beans::PropertyState SvxShape::_getPropertyState( const OUString& PropertyName ) { ::SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry(PropertyName); if( !HasSdrObject() || pMap == nullptr ) throw beans::UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this)); @@ -2058,7 +2058,7 @@ beans::PropertyState SvxShape::_getPropertyState( const OUString& PropertyName ) return eState; } -bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -2524,7 +2524,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl } -bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) +bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { switch( pProperty->nWID ) { @@ -2921,7 +2921,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl } -bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) +bool SvxShape::getPropertyStateImpl( const SfxItemPropertyMapEntry* pProperty, css::beans::PropertyState& rState ) { if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE ) { @@ -2951,7 +2951,7 @@ bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty } -bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) +bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertyMapEntry* pProperty ) { if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE ) { @@ -2999,7 +2999,7 @@ void SvxShape::_setPropertyToDefault( const OUString& PropertyName ) { ::SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pProperty = mpPropSet->getPropertyMapEntry(PropertyName); + const SfxItemPropertyMapEntry* pProperty = mpPropSet->getPropertyMapEntry(PropertyName); if( !HasSdrObject() || pProperty == nullptr ) throw beans::UnknownPropertyException( PropertyName, static_cast<cppu::OWeakObject*>(this)); @@ -3029,7 +3029,7 @@ uno::Any SvxShape::_getPropertyDefault( const OUString& aPropertyName ) { ::SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMapEntry(aPropertyName); + const SfxItemPropertyMapEntry* pMap = mpPropSet->getPropertyMapEntry(aPropertyName); if( !HasSdrObject() || pMap == nullptr ) throw beans::UnknownPropertyException( aPropertyName, static_cast<cppu::OWeakObject*>(this)); @@ -3884,7 +3884,7 @@ void SAL_CALL SvxShapeText::setString( const OUString& aString ) } // override these for special property handling in subcasses. Return true if property is handled -bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) +bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) { // HACK-fix #99090# // since SdrTextObj::SetVerticalWriting exchanges @@ -3907,7 +3907,7 @@ bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPro return SvxShape::setPropertyValueImpl( rName, pProperty, rValue ); } -bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) +bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) { if( pProperty->nWID == SDRATTR_TEXTDIRECTION ) { @@ -3922,12 +3922,12 @@ bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPro return SvxShape::getPropertyValueImpl( rName, pProperty, rValue ); } -bool SvxShapeText::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) +bool SvxShapeText::getPropertyStateImpl( const SfxItemPropertyMapEntry* pProperty, css::beans::PropertyState& rState ) { return SvxShape::getPropertyStateImpl( pProperty, rState ); } -bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) +bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertyMapEntry* pProperty ) { return SvxShape::setPropertyToDefaultImpl( pProperty ); } @@ -3979,7 +3979,7 @@ SdrObject* SdrObject::getSdrObjectFromXShape( const css::uno::Reference< css::un return pSvxShape ? pSvxShape->GetSdrObject() : nullptr; } -uno::Any SvxItemPropertySet_getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) +uno::Any SvxItemPropertySet_getPropertyValue( const SfxItemPropertyMapEntry* pMap, const SfxItemSet& rSet ) { if(!pMap || !pMap->nWID) return uno::Any(); @@ -3989,7 +3989,7 @@ uno::Any SvxItemPropertySet_getPropertyValue( const SfxItemPropertySimpleEntry* return SvxItemPropertySet::getPropertyValue( pMap, rSet, (pMap->nWID != SDRATTR_XMLATTRIBUTES), bDontConvertNegativeValues ); } -void SvxItemPropertySet_setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet ) +void SvxItemPropertySet_setPropertyValue( const SfxItemPropertyMapEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet ) { if(!pMap || !pMap->nWID) return; diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 28984e6950e3..f7477565a4d7 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -29,6 +29,7 @@ class SfxItemSet; class SfxItemPropertySet; struct SfxItemPropertySimpleEntry; +struct SfxItemPropertyMapEntry; class SdrObject; class SwTextNode; class SwCursor; @@ -77,7 +78,7 @@ namespace SwUnoCursorHelper GetNestedTextContent(SwTextNode const & rTextNode, sal_Int32 const nIndex, bool const bParent); - bool getCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry + bool getCursorPropertyValue(const SfxItemPropertyMapEntry& rEntry , SwPaM& rPam , css::uno::Any *pAny , css::beans::PropertyState& eState @@ -91,7 +92,7 @@ namespace SwUnoCursorHelper { return rUnoCursor.GetContentNode() && rUnoCursor.GetPoint()->nContent == rUnoCursor.GetContentNode()->Len();} - void resetCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam); + void resetCursorPropertyValue(const SfxItemPropertyMapEntry& rEntry, SwPaM& rPam); /// @throws css::lang::IllegalArgumentException /// @throws css::io::IOException /// @throws css::uno::RuntimeException @@ -217,7 +218,7 @@ namespace SwUnoCursorHelper /// @throws css::uno::RuntimeException /// @throws css::uno::DeploymentException bool SetCursorPropertyValue( - SfxItemPropertySimpleEntry const& rEntry, + SfxItemPropertyMapEntry const& rEntry, css::uno::Any const& rValue, SwPaM & rPam, SfxItemSet & rItemSet); diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 3939e274021e..63378702ad18 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1488,16 +1488,16 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( { const SfxItemPropertyMap& rPropMap = aSwMapProvider.GetPropertySet( PROPERTY_MAP_TEXT_CURSOR )->getPropertyMap(); - for ( const auto& rPair : rPropMap.getPropertyEntries() ) + for ( const auto pEntry : rPropMap.getPropertyEntries() ) { - const SfxPoolItem* pItem = pSet->GetItem( rPair.second.nWID ); + const SfxPoolItem* pItem = pSet->GetItem( pEntry->nWID ); if ( pItem ) { uno::Any aVal; - pItem->QueryValue( aVal, rPair.second.nMemberId ); + pItem->QueryValue( aVal, pEntry->nMemberId ); PropertyValue rPropVal; - rPropVal.Name = rPair.first; + rPropVal.Name = pEntry->aName; rPropVal.Value = aVal; rPropVal.Handle = -1; rPropVal.State = beans::PropertyState_DEFAULT_VALUE; @@ -1680,18 +1680,18 @@ void SwAccessibleParagraph::_getRunAttributesImpl( const SfxItemPropertyMap& rPropMap = aSwMapProvider.GetPropertySet( PROPERTY_MAP_TEXT_CURSOR )->getPropertyMap(); - for ( const auto& rPair : rPropMap.getPropertyEntries() ) + for ( const auto pEntry : rPropMap.getPropertyEntries() ) { const SfxPoolItem* pItem( nullptr ); // #i82637# - Found character attributes, whose value equals the value of // the corresponding default character attributes, are excluded. - if ( aSet.GetItemState( rPair.second.nWID, true, &pItem ) == SfxItemState::SET ) + if ( aSet.GetItemState( pEntry->nWID, true, &pItem ) == SfxItemState::SET ) { uno::Any aVal; - pItem->QueryValue( aVal, rPair.second.nMemberId ); + pItem->QueryValue( aVal, pEntry->nMemberId ); PropertyValue rPropVal; - rPropVal.Name = rPair.first; + rPropVal.Name = pEntry->aName; rPropVal.Value = aVal; rPropVal.Handle = -1; rPropVal.State = PropertyState_DIRECT_VALUE; @@ -1776,7 +1776,7 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl( { const SfxItemPropertyMapEntry* pPropMap( aSwMapProvider.GetPropertyMapEntries( PROPERTY_MAP_ACCESSIBILITY_TEXT_ATTRIBUTE ) ); - while ( !pPropMap->aName.empty() ) + while ( !pPropMap->aName.isEmpty() ) { const SfxPoolItem* pItem = pSet->GetItem( pPropMap->nWID ); if ( pItem ) diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index 84ed54d0bc86..eee83c4a7771 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -137,7 +137,7 @@ protected: const css::uno::Sequence< OUString >& aPropertyNames ); void GetPropertyValue( css::uno::Any &rVal, - const SfxItemPropertySimpleEntry& rEntry, SwUnoCursor *pUnoCursor, std::unique_ptr<SfxItemSet> &pSet ); + const SfxItemPropertyMapEntry& rEntry, SwUnoCursor *pUnoCursor, std::unique_ptr<SfxItemSet> &pSet ); /// @throws css::uno::RuntimeException css::uno::Sequence<css::beans::GetDirectPropertyTolerantResult> GetPropertyValuesTolerant_Impl( diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx index 19ceff59db05..9961effe2b05 100644 --- a/sw/source/core/unocore/SwXTextDefaults.cxx +++ b/sw/source/core/unocore/SwXTextDefaults.cxx @@ -64,7 +64,7 @@ void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName, SolarMutexGuard aGuard; if (!m_pDoc) throw RuntimeException(); - const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pMap) throw UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if ( pMap->nFlags & PropertyAttribute::READONLY) @@ -124,7 +124,7 @@ Any SAL_CALL SwXTextDefaults::getPropertyValue( const OUString& rPropertyName ) SolarMutexGuard aGuard; if (!m_pDoc) throw RuntimeException(); - const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pMap) throw UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); Any aRet; @@ -160,7 +160,7 @@ PropertyState SAL_CALL SwXTextDefaults::getPropertyState( const OUString& rPrope PropertyState eRet = PropertyState_DIRECT_VALUE; if (!m_pDoc) throw RuntimeException(); - const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pMap) throw UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -185,7 +185,7 @@ void SAL_CALL SwXTextDefaults::setPropertyToDefault( const OUString& rPropertyNa { if (!m_pDoc) throw RuntimeException(); - const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pMap) throw UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if ( pMap->nFlags & PropertyAttribute::READONLY) @@ -198,7 +198,7 @@ Any SAL_CALL SwXTextDefaults::getPropertyDefault( const OUString& rPropertyName { if (!m_pDoc) throw RuntimeException(); - const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pMap) throw UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); Any aRet; diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index fdcdb0f76c1e..7536e49cce4c 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -317,20 +317,20 @@ static uno::Any GetParaListAutoFormat(SwTextNode const& rNode) SfxItemPropertyMap const& rMap(rPropSet.getPropertyMap()); std::vector<beans::NamedValue> props; // have to iterate the map, not the item set? - for (auto const& rPair : rMap.getPropertyEntries()) + for (auto const pEntry : rMap.getPropertyEntries()) { - if (rPropSet.getPropertyState(rPair.second, rSet) == PropertyState_DIRECT_VALUE) + if (rPropSet.getPropertyState(*pEntry, rSet) == PropertyState_DIRECT_VALUE) { Any value; - rPropSet.getPropertyValue(rPair.second, rSet, value); - props.emplace_back(OUString(rPair.first), value); + rPropSet.getPropertyValue(*pEntry, rSet, value); + props.emplace_back(pEntry->aName, value); } } return uno::makeAny(comphelper::containerToSequence(props)); } // Read the special properties of the cursor -bool getCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry +bool getCursorPropertyValue(const SfxItemPropertyMapEntry& rEntry , SwPaM& rPam , Any *pAny , PropertyState& eState @@ -983,7 +983,7 @@ void GetCurPageStyle(SwPaM const & rPaM, OUString &rString) } // reset special properties of the cursor -void resetCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam) +void resetCursorPropertyValue(const SfxItemPropertyMapEntry& rEntry, SwPaM& rPam) { SwDoc& rDoc = rPam.GetDoc(); switch(rEntry.nWID) @@ -1290,7 +1290,7 @@ void makeRedline( SwPaM const & rPaM, // Build set of attributes we want to fetch std::vector<sal_uInt16> aWhichPairs; - std::vector<SfxItemPropertySimpleEntry const*> aEntries; + std::vector<SfxItemPropertyMapEntry const*> aEntries; std::vector<uno::Any> aValues; aEntries.reserve(aRevertProperties.getLength()); sal_uInt16 nStyleId = USHRT_MAX; @@ -1298,7 +1298,7 @@ void makeRedline( SwPaM const & rPaM, for (const auto& rRevertProperty : std::as_const(aRevertProperties)) { const OUString &rPropertyName = rRevertProperty.Name; - SfxItemPropertySimpleEntry const* pEntry = rPropSet.getPropertyMap().getByName(rPropertyName); + SfxItemPropertyMapEntry const* pEntry = rPropSet.getPropertyMap().getByName(rPropertyName); if (!pEntry) { @@ -1336,7 +1336,7 @@ void makeRedline( SwPaM const & rPaM, for (size_t i = 0; i < aEntries.size(); ++i) { - SfxItemPropertySimpleEntry const*const pEntry = aEntries[i]; + SfxItemPropertyMapEntry const*const pEntry = aEntries[i]; const uno::Any &rValue = aValues[i]; if (i == nNumId) { diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index cb20c5853291..79c3ac7fd8e7 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -1039,7 +1039,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a { SolarMutexGuard aGuard; SwFrameFormat* pFormat = GetFrameFormat(); - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if(!m_xShapeAgg.is()) return; @@ -1450,7 +1450,7 @@ uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName) SwFrameFormat* pFormat = GetFrameFormat(); if(m_xShapeAgg.is()) { - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if(pEntry) { if(pFormat) @@ -1776,7 +1776,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( uno::Reference< XPropertyState > xShapePrState; for(sal_Int32 nProperty = 0; nProperty < aPropertyNames.getLength(); nProperty++) { - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( pNames[nProperty] ); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( pNames[nProperty] ); if(pEntry) { if(RES_OPAQUE == pEntry->nWID) @@ -1874,7 +1874,7 @@ void SwXShape::setPropertyToDefault( const OUString& rPropertyName ) if(!m_xShapeAgg.is()) throw uno::RuntimeException(); - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if(pEntry) { if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) @@ -1936,7 +1936,7 @@ uno::Any SwXShape::getPropertyDefault( const OUString& rPropertyName ) if(!m_xShapeAgg.is()) throw uno::RuntimeException(); - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if(pEntry) { if(!(pEntry->nWID < RES_FRMATR_END && pFormat)) diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 73d8d2e4e188..07a5b0bed2cc 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -314,7 +314,7 @@ static sal_uInt16 GetFieldTypeMId( std::u16string_view rProperty, const SwFieldT nId = USHRT_MAX; else { - const SfxItemPropertySimpleEntry* pEntry = pSet->getPropertyMap().getByName(rProperty); + const SfxItemPropertyMapEntry* pEntry = pSet->getPropertyMap().getByName(rProperty); nId = pEntry ? pEntry->nWID : USHRT_MAX; } return nId; @@ -2164,7 +2164,7 @@ SwXTextField::setPropertyValue( SwField const*const pField = m_pImpl->GetField(); const SfxItemPropertySet* _pPropSet = aSwMapProvider.GetPropertySet( lcl_GetPropertyMapOfService(m_pImpl->m_nServiceId)); - const SfxItemPropertySimpleEntry* pEntry = _pPropSet->getPropertyMap().getByName(rPropertyName); + const SfxItemPropertyMapEntry* pEntry = _pPropSet->getPropertyMap().getByName(rPropertyName); if (!pEntry) throw beans::UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -2317,7 +2317,7 @@ uno::Any SAL_CALL SwXTextField::getPropertyValue(const OUString& rPropertyName) SwField const*const pField = m_pImpl->GetField(); const SfxItemPropertySet* _pPropSet = aSwMapProvider.GetPropertySet( lcl_GetPropertyMapOfService(m_pImpl->m_nServiceId)); - const SfxItemPropertySimpleEntry* pEntry = _pPropSet->getPropertyMap().getByName(rPropertyName); + const SfxItemPropertyMapEntry* pEntry = _pPropSet->getPropertyMap().getByName(rPropertyName); if(!pEntry ) { const SfxItemPropertySet* _pParaPropSet = aSwMapProvider.GetPropertySet(PROPERTY_MAP_PARAGRAPH_EXTENSIONS); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 93a99f5fd973..2772c4cdb3fb 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1414,7 +1414,7 @@ void SwXFrame::setPropertyValue(const OUString& rPropertyName, const ::uno::Any& return; } - const ::SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); + const ::SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); if (!pEntry) throw beans::UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -1980,7 +1980,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) SolarMutexGuard aGuard; uno::Any aAny; SwFrameFormat* pFormat = GetFrameFormat(); - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); if (!pEntry) throw beans::UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -2390,7 +2390,7 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates( const SwAttrSet& rFormatSet = pFormat->GetAttrSet(); for(int i = 0; i < aPropertyNames.getLength(); i++) { - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(pNames[i]); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName(pNames[i]); if (!pEntry) throw beans::UnknownPropertyException("Unknown property: " + pNames[i], static_cast < cppu::OWeakObject * > ( this ) ); @@ -2468,7 +2468,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) SwFrameFormat* pFormat = GetFrameFormat(); if(pFormat) { - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); if (!pEntry) throw beans::UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) @@ -2560,7 +2560,7 @@ uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName ) SwFrameFormat* pFormat = GetFrameFormat(); if(pFormat) { - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); if(!pEntry) throw beans::UnknownPropertyException( "Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 697f57358d5c..7783e65756e1 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -528,7 +528,7 @@ SwXDocumentIndex::setPropertyValue( { SolarMutexGuard aGuard; - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName); if (!pEntry) { @@ -861,7 +861,7 @@ SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName) SolarMutexGuard aGuard; uno::Any aRet; - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName); if (!pEntry) { @@ -2042,7 +2042,7 @@ SwXDocumentIndexMark::setPropertyValue( { SolarMutexGuard aGuard; - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName); if (!pEntry) { @@ -2179,7 +2179,7 @@ SwXDocumentIndexMark::getPropertyValue(const OUString& rPropertyName) SolarMutexGuard aGuard; uno::Any aRet; - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName); if (!pEntry) { diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index ff415b7ab658..247f3d84ece5 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -707,7 +707,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s SfxItemPropertyMapEntry* aTextDefaultMap_Impl = GetTextDefaultPropertyMap(); m_aMapEntriesArr[nPropertyId] = aTextDefaultMap_Impl; for( SfxItemPropertyMapEntry * pMap = aTextDefaultMap_Impl; - !pMap->aName.empty(); ++pMap ) + !pMap->aName.isEmpty(); ++pMap ) { // UNO_NAME_PAGE_DESC_NAME should keep its MAYBEVOID flag if (RES_PAGEDESC != pMap->nWID || MID_PAGEDESC_PAGEDESCNAME != pMap->nMemberId) diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 0a465bb170eb..079e69ba2abc 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -435,7 +435,7 @@ lcl_setRubyCharstyle(SfxItemSet & rItemSet, uno::Any const& rValue) bool SwUnoCursorHelper::SetCursorPropertyValue( - SfxItemPropertySimpleEntry const& rEntry, const uno::Any& rValue, + SfxItemPropertyMapEntry const& rEntry, const uno::Any& rValue, SwPaM & rPam, SfxItemSet & rItemSet) { if (!(rEntry.nFlags & beans::PropertyAttribute::MAYBEVOID) && @@ -526,7 +526,7 @@ SwUnoCursorHelper::SetCursorPropertyValue( for (beans::NamedValue const & prop : std::as_const(props)) { - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = rMap.getByName(prop.Name); if (!pEntry) { @@ -1722,7 +1722,7 @@ uno::Any SwUnoCursorHelper::GetPropertyValue( std::u16string_view rPropertyName) { uno::Any aAny; - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = rPropSet.getPropertyMap().getByName(rPropertyName); if (!pEntry) @@ -1789,13 +1789,13 @@ void SwUnoCursorHelper::SetPropertyValues( // Build set of attributes we want to fetch const sal_uInt16 zero = 0; SfxItemSet aItemSet(rDoc.GetAttrPool(), &zero); - std::vector<std::pair<const SfxItemPropertySimpleEntry*, const uno::Any&>> aEntries; + std::vector<std::pair<const SfxItemPropertyMapEntry*, const uno::Any&>> aEntries; aEntries.reserve(rPropertyValues.getLength()); for (const auto& rPropVal : rPropertyValues) { const OUString &rPropertyName = rPropVal.Name; - SfxItemPropertySimpleEntry const* pEntry = + SfxItemPropertyMapEntry const* pEntry = rPropSet.getPropertyMap().getByName(rPropertyName); // Queue up any exceptions until the end ... @@ -1820,7 +1820,7 @@ void SwUnoCursorHelper::SetPropertyValues( bool bPreviousPropertyCausesSideEffectsInNodes = false; for (size_t i = 0; i < aEntries.size(); ++i) { - SfxItemPropertySimpleEntry const*const pEntry = aEntries[i].first; + SfxItemPropertyMapEntry const*const pEntry = aEntries[i].first; bool bPropertyCausesSideEffectsInNodes = propertyCausesSideEffectsInNodes(pEntry->nWID); @@ -1872,7 +1872,7 @@ SwUnoCursorHelper::GetPropertyStates( for (sal_Int32 i = 0, nEnd = rPropertyNames.getLength(); i < nEnd; i++) { - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = rMap.getByName( pNames[i] ); if(!pEntry) { @@ -2003,7 +2003,7 @@ void SwUnoCursorHelper::SetPropertyToDefault( std::u16string_view rPropertyName) { SwDoc& rDoc = rPaM.GetDoc(); - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = rPropSet.getPropertyMap().getByName(rPropertyName); if (!pEntry) { @@ -2041,7 +2041,7 @@ uno::Any SwUnoCursorHelper::GetPropertyDefault( SwPaM const & rPaM, const SfxItemPropertySet& rPropSet, std::u16string_view rPropertyName) { - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = rPropSet.getPropertyMap().getByName(rPropertyName); if (!pEntry) { @@ -2357,7 +2357,7 @@ SwXTextCursor::setPropertiesToDefault( o3tl::sorted_vector<sal_uInt16> aParaWhichIds; for (const OUString& rName : rPropertyNames) { - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap().getByName( rName ); if (!pEntry) { @@ -2421,7 +2421,7 @@ SwXTextCursor::getPropertyDefaults( uno::Any *pAny = aRet.getArray(); for (sal_Int32 i = 0; i < nCount; i++) { - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap().getByName( pNames[i] ); if (!pEntry) { diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 4ad34f531871..249956dd17c9 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -106,7 +106,7 @@ SwParaSelection::~SwParaSelection() static beans::PropertyState lcl_SwXParagraph_getPropertyState( const SwTextNode& rTextNode, const SwAttrSet** ppSet, - const SfxItemPropertySimpleEntry& rEntry, + const SfxItemPropertyMapEntry& rEntry, bool &rAttrSetFetched ); class SwXParagraph::Impl @@ -173,7 +173,7 @@ public: /// @throws uno::RuntimeException void GetSinglePropertyValue_Impl( - const SfxItemPropertySimpleEntry& rEntry, + const SfxItemPropertyMapEntry& rEntry, const SfxItemSet& rSet, uno::Any& rAny ) const; @@ -391,7 +391,7 @@ void SwXParagraph::Impl::SetPropertyValues_Impl( uno::Sequence< beans::PropertyValue > aValues( rPropertyNames.getLength() ); for (sal_Int32 nProp = 0; nProp < rPropertyNames.getLength(); nProp++) { - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = rMap.getByName( pPropertyNames[nProp] ); if (!pEntry) { @@ -434,7 +434,7 @@ void SAL_CALL SwXParagraph::setPropertyValues( // Support for DrawingLayer FillStyles for GetPropertyValue() usages void SwXParagraph::Impl::GetSinglePropertyValue_Impl( - const SfxItemPropertySimpleEntry& rEntry, + const SfxItemPropertyMapEntry& rEntry, const SfxItemSet& rSet, uno::Any& rAny ) const { @@ -535,7 +535,7 @@ uno::Sequence< uno::Any > SwXParagraph::Impl::GetPropertyValues_Impl( const SwAttrSet& rAttrSet( rTextNode.GetSwAttrSet() ); for (sal_Int32 nProp = 0; nProp < rPropertyNames.getLength(); nProp++) { - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = rMap.getByName( pPropertyNames[nProp] ); if (!pEntry) { @@ -648,7 +648,7 @@ SwXParagraph::setPropertyValuesTolerant( { pFailed[ nFailed ].Name = pProp[i]; - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = rPropMap.getByName( pProp[i] ); if (!pEntry) { @@ -757,7 +757,7 @@ SwXParagraph::Impl::GetPropertyValuesTolerant_Impl( { rResult.Name = rProp; - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = rPropMap.getByName( rProp ); if (!pEntry) // property available? { @@ -903,7 +903,7 @@ SwXParagraph::removeVetoableChangeListener( static beans::PropertyState lcl_SwXParagraph_getPropertyState( const SwTextNode& rTextNode, const SwAttrSet** ppSet, - const SfxItemPropertySimpleEntry& rEntry, + const SfxItemPropertyMapEntry& rEntry, bool &rAttrSetFetched) { beans::PropertyState eRet(beans::PropertyState_DEFAULT_VALUE); @@ -1013,7 +1013,7 @@ SwXParagraph::getPropertyState(const OUString& rPropertyName) SwTextNode & rTextNode(m_pImpl->GetTextNodeOrThrow()); const SwAttrSet* pSet = nullptr; - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName); if (!pEntry) { @@ -1045,7 +1045,7 @@ SwXParagraph::getPropertyStates( for (sal_Int32 i = 0, nEnd = PropertyNames.getLength(); i < nEnd; ++i, ++pStates, ++pNames) { - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = rMap.getByName( *pNames ); if (!pEntry) { @@ -1086,7 +1086,7 @@ SwXParagraph::setPropertyToDefault(const OUString& rPropertyName) // select paragraph SwParaSelection aParaSel( aCursor ); - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap().getByName( rPropertyName ); if (!pEntry) { @@ -1169,7 +1169,7 @@ SwXParagraph::getPropertyDefault(const OUString& rPropertyName) return aRet; } - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName); if (!pEntry) { diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 926d7db5b837..d559cee1a133 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -210,7 +210,7 @@ void SwXTextPortion::setPropertyValue(const OUString& rPropertyName, void SwXTextPortion::GetPropertyValue( uno::Any &rVal, - const SfxItemPropertySimpleEntry& rEntry, + const SfxItemPropertyMapEntry& rEntry, SwUnoCursor *pUnoCursor, std::unique_ptr<SfxItemSet> &pSet ) { @@ -385,7 +385,7 @@ uno::Sequence< uno::Any > SwXTextPortion::GetPropertyValues_Impl( const SfxItemPropertyMap& rMap = m_pPropSet->getPropertyMap(); for(sal_Int32 nProp = 0; nProp < nLength; nProp++) { - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(pPropertyNames[nProp]); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(pPropertyNames[nProp]); if(!pEntry) throw beans::UnknownPropertyException( "Unknown property: " + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); GetPropertyValue( pValues[nProp], *pEntry, &rUnoCursor, pSet ); @@ -415,7 +415,7 @@ void SwXTextPortion::SetPropertyValues_Impl( uno::Sequence< beans::PropertyValue > aValues( rPropertyNames.getLength() ); for(sal_Int32 nProp = 0; nProp < rPropertyNames.getLength(); nProp++) { - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(pPropertyNames[nProp]); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(pPropertyNames[nProp]); if (!pEntry) throw beans::UnknownPropertyException( "Unknown property: " + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) ); if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) @@ -505,7 +505,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPr { pFailed[ nFailed ].Name = pProp[i]; - const SfxItemPropertySimpleEntry* pEntry = rPropMap.getByName( pProp[i] ); + const SfxItemPropertyMapEntry* pEntry = rPropMap.getByName( pProp[i] ); if (!pEntry) pFailed[ nFailed++ ].Result = beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY; else @@ -609,7 +609,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SwXTextPortion::GetPrope } else { - const SfxItemPropertySimpleEntry* pEntry = rPropMap.getByName( pProp[i] ); + const SfxItemPropertyMapEntry* pEntry = rPropMap.getByName( pProp[i] ); if (!pEntry) throw beans::UnknownPropertyException( "Unknown property: " + pProp[i], static_cast < cppu::OWeakObject * > ( this ) ); aResult.State = pPropertyStates[i]; diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 6a3a0d8c6d9e..1cd3f8d50a20 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -597,7 +597,7 @@ void SwXTextSection::Impl::SetPropertyValues_Impl( for (sal_Int32 nProperty = 0; nProperty < rPropertyNames.getLength(); nProperty++) { - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_rPropSet.getPropertyMap().getByName(pPropertyNames[nProperty]); if (!pEntry) { @@ -980,7 +980,7 @@ SwXTextSection::Impl::GetPropertyValues_Impl( for (sal_Int32 nProperty = 0; nProperty < rPropertyNames.getLength(); nProperty++) { - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_rPropSet.getPropertyMap().getByName(pPropertyNames[nProperty]); if (!pEntry) { @@ -1383,7 +1383,7 @@ SwXTextSection::getPropertyStates( for (sal_Int32 i = 0; i < rPropertyNames.getLength(); i++) { pStates[i] = beans::PropertyState_DEFAULT_VALUE; - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap().getByName( pNames[i]); if (!pEntry) { @@ -1458,7 +1458,7 @@ SwXTextSection::setPropertyToDefault(const OUString& rPropertyName) throw uno::RuntimeException(); } - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName); if (!pEntry) { @@ -1596,7 +1596,7 @@ SwXTextSection::getPropertyDefault(const OUString& rPropertyName) uno::Any aRet; SwSectionFormat *const pFormat = m_pImpl->GetSectionFormat(); - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName); if (!pEntry) { diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index a79e4d57e62f..073cee394e96 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -308,7 +308,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons if(!m_pDoc) throw uno::RuntimeException(); - const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName ); if(!pEntry) throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -429,7 +429,7 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName) if(!m_pDoc) throw uno::RuntimeException(); - const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName ); if(!pEntry) throw UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -587,7 +587,7 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const if(!m_pDoc) return; - const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName ); if(!pEntry) throw UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -661,7 +661,7 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName) uno::Any aRet; if(m_pDoc) { - const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName ); if(!pEntry) throw UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -790,7 +790,7 @@ void SwXLineNumberingProperties::setPropertyValue( if(!m_pDoc) throw uno::RuntimeException(); - const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName ); if(!pEntry) throw UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -904,7 +904,7 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName) if(!m_pDoc) throw uno::RuntimeException(); - const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName ); if(!pEntry) throw UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -2299,7 +2299,7 @@ uno::Reference< XPropertySetInfo > SwXTextColumns::getPropertySetInfo( ) void SwXTextColumns::setPropertyValue( const OUString& rPropertyName, const Any& aValue ) { - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pEntry) throw UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); if ( pEntry->nFlags & PropertyAttribute::READONLY) @@ -2372,7 +2372,7 @@ void SwXTextColumns::setPropertyValue( const OUString& rPropertyName, const Any& Any SwXTextColumns::getPropertyValue( const OUString& rPropertyName ) { - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pEntry) throw UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index 0c4e6a50aee7..db0a98b2e7ea 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -150,7 +150,7 @@ void SwSearchProperties_Impl::FillItemSet(SfxItemSet& rSet, bool bIsValueSearch) for(auto const & rPair : maValues) { SfxPoolItem* pTempItem = nullptr; - const SfxItemPropertySimpleEntry & rPropEntry = mrMap.getPropertyEntries().find(std::u16string_view(rPair.first))->second; + const SfxItemPropertyMapEntry & rPropEntry = *mrMap.getByName(rPair.first); sal_uInt16 nWID = rPropEntry.nWID; switch(nWID) { @@ -391,7 +391,7 @@ uno::Reference< beans::XPropertySetInfo > SwXTextSearch::getPropertySetInfo() void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) { SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); if(!pEntry) throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -423,7 +423,7 @@ uno::Any SwXTextSearch::getPropertyValue(const OUString& rPropertyName) SolarMutexGuard aGuard; uno::Any aRet; - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); bool bSet = false; if(!pEntry) throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 3c70dc9eaa93..3acda97229b4 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -323,13 +323,13 @@ protected: css::uno::Reference<css::beans::XPropertySet> m_xStyleData; template<sal_uInt16> - void SetPropertyValue(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any&, SwStyleBase_Impl&); + void SetPropertyValue(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, const uno::Any&, SwStyleBase_Impl&); void SetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ); SfxStyleSheetBase* GetStyleSheetBase(); void PrepareStyleBase(SwStyleBase_Impl& rBase); template<sal_uInt16> - uno::Any GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase); - uno::Any GetStyleProperty_Impl(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase); + uno::Any GetStyleProperty(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase); + uno::Any GetStyleProperty_Impl(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase); uno::Any GetPropertyValue_Impl(const SfxItemPropertySet* pPropSet, SwStyleBase_Impl& rBase, const OUString& rPropertyName); public: @@ -418,8 +418,8 @@ public: /// @throws lang::IllegalArgumentException /// @throws lang::WrappedTargetException /// @throws uno::RuntimeException - void SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase); - void PutItemToSet(const SvxSetItem* pSetItem, const SfxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry& rEntry, const uno::Any& rVal, SwStyleBase_Impl& rBaseImpl); + void SetStyleProperty(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase); + void PutItemToSet(const SvxSetItem* pSetItem, const SfxItemPropertySet& rPropSet, const SfxItemPropertyMapEntry& rEntry, const uno::Any& rVal, SwStyleBase_Impl& rBaseImpl); }; class SwXFrameStyle @@ -1587,7 +1587,7 @@ const SwPageDesc* SwStyleBase_Impl::GetOldPageDesc() -static sal_uInt8 lcl_TranslateMetric(const SfxItemPropertySimpleEntry& rEntry, SwDoc* pDoc, uno::Any& o_aValue) +static sal_uInt8 lcl_TranslateMetric(const SfxItemPropertyMapEntry& rEntry, SwDoc* pDoc, uno::Any& o_aValue) { // check for needed metric translation if(!(rEntry.nMoreFlags & PropertyMoreFlags::METRIC_ITEM)) @@ -1608,7 +1608,7 @@ static sal_uInt8 lcl_TranslateMetric(const SfxItemPropertySimpleEntry& rEntry, S return rEntry.nMemberId; } template<> -void SwXStyle::SetPropertyValue<HINT_BEGIN>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<HINT_BEGIN>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { // default ItemSet handling SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet(); @@ -1618,7 +1618,7 @@ void SwXStyle::SetPropertyValue<HINT_BEGIN>(const SfxItemPropertySimpleEntry& rE rStyleSet.Put(aSet); } template<> -void SwXStyle::SetPropertyValue<FN_UNO_HIDDEN>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<FN_UNO_HIDDEN>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { bool bHidden = false; if(rValue >>= bHidden) @@ -1630,14 +1630,14 @@ void SwXStyle::SetPropertyValue<FN_UNO_HIDDEN>(const SfxItemPropertySimpleEntry& SetPropertyValue<HINT_BEGIN>(rEntry, rPropSet, rValue, o_rStyleBase); } template<> -void SwXStyle::SetPropertyValue<FN_UNO_STYLE_INTEROP_GRAB_BAG>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<FN_UNO_STYLE_INTEROP_GRAB_BAG>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { o_rStyleBase.getNewBase()->GetItemSet(); o_rStyleBase.getNewBase()->SetGrabBagItem(rValue); SetPropertyValue<HINT_BEGIN>(rEntry, rPropSet, rValue, o_rStyleBase); } template<> -void SwXStyle::SetPropertyValue<sal_uInt16(XATTR_FILLGRADIENT)>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<sal_uInt16(XATTR_FILLGRADIENT)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { uno::Any aValue(rValue); const auto nMemberId(lcl_TranslateMetric(rEntry, m_pDoc, aValue)); @@ -1664,7 +1664,7 @@ void SwXStyle::SetPropertyValue<sal_uInt16(XATTR_FILLGRADIENT)>(const SfxItemPro SetPropertyValue<HINT_BEGIN>(rEntry, rPropSet, aValue, o_rStyleBase); } template<> -void SwXStyle::SetPropertyValue<sal_uInt16(RES_BACKGROUND)>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<sal_uInt16(RES_BACKGROUND)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { SfxItemSet& rStyleSet = o_rStyleBase.GetItemSet(); const std::unique_ptr<SvxBrushItem> aOriginalBrushItem(getSvxBrushItemFromSourceSet(rStyleSet, RES_BACKGROUND, true, m_pDoc->IsInXMLImport())); @@ -1683,7 +1683,7 @@ void SwXStyle::SetPropertyValue<sal_uInt16(RES_BACKGROUND)>(const SfxItemPropert setSvxBrushItemAsFillAttributesToTargetSet(*aChangedBrushItem, rStyleSet); } template<> -void SwXStyle::SetPropertyValue<OWN_ATTR_FILLBMP_MODE>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<OWN_ATTR_FILLBMP_MODE>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { drawing::BitmapMode eMode; if(!(rValue >>= eMode)) @@ -1697,7 +1697,7 @@ void SwXStyle::SetPropertyValue<OWN_ATTR_FILLBMP_MODE>(const SfxItemPropertySimp rStyleSet.Put(XFillBmpTileItem(drawing::BitmapMode_REPEAT == eMode)); } template<> -void SwXStyle::SetPropertyValue<sal_uInt16(RES_PAPER_BIN)>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<sal_uInt16(RES_PAPER_BIN)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { if(!rValue.has<OUString>()) throw lang::IllegalArgumentException(); @@ -1727,7 +1727,7 @@ void SwXStyle::SetPropertyValue<sal_uInt16(RES_PAPER_BIN)>(const SfxItemProperty rStyleSet.Put(aSet); } template<> -void SwXStyle::SetPropertyValue<FN_UNO_NUM_RULES>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<FN_UNO_NUM_RULES>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { if(!rValue.has<uno::Reference<container::XIndexReplace>>() || !rValue.has<uno::Reference<lang::XUnoTunnel>>()) throw lang::IllegalArgumentException(); @@ -1778,7 +1778,7 @@ void SwXStyle::SetPropertyValue<FN_UNO_NUM_RULES>(const SfxItemPropertySimpleEnt o_rStyleBase.getNewBase()->SetNumRule(aSetRule); } template<> -void SwXStyle::SetPropertyValue<sal_uInt16(RES_PARATR_OUTLINELEVEL)>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<sal_uInt16(RES_PARATR_OUTLINELEVEL)>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { if(!rValue.has<sal_Int16>()) return; @@ -1787,7 +1787,7 @@ void SwXStyle::SetPropertyValue<sal_uInt16(RES_PARATR_OUTLINELEVEL)>(const SfxIt o_rStyleBase.getNewBase()->GetCollection()->SetAttrOutlineLevel(nLevel); } template<> -void SwXStyle::SetPropertyValue<FN_UNO_FOLLOW_STYLE>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<FN_UNO_FOLLOW_STYLE>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { if(!rValue.has<OUString>()) return; @@ -1797,7 +1797,7 @@ void SwXStyle::SetPropertyValue<FN_UNO_FOLLOW_STYLE>(const SfxItemPropertySimple o_rStyleBase.getNewBase()->SetFollow(aString); } template<> -void SwXStyle::SetPropertyValue<sal_uInt16(RES_PAGEDESC)>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<sal_uInt16(RES_PAGEDESC)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { if(MID_PAGEDESC_PAGEDESCNAME != rEntry.nMemberId) { @@ -1834,7 +1834,7 @@ void SwXStyle::SetPropertyValue<sal_uInt16(RES_PAGEDESC)>(const SfxItemPropertyS } } template<> -void SwXStyle::SetPropertyValue<sal_uInt16(RES_TEXT_VERT_ADJUST)>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<sal_uInt16(RES_TEXT_VERT_ADJUST)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { if(m_rEntry.m_eFamily != SfxStyleFamily::Page) { @@ -1848,7 +1848,7 @@ void SwXStyle::SetPropertyValue<sal_uInt16(RES_TEXT_VERT_ADJUST)>(const SfxItemP pPageDesc->SetVerticalAdjustment(rValue.get<drawing::TextVerticalAdjust>()); } template<> -void SwXStyle::SetPropertyValue<FN_UNO_IS_AUTO_UPDATE>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<FN_UNO_IS_AUTO_UPDATE>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { if(!rValue.has<bool>()) throw lang::IllegalArgumentException(); @@ -1859,7 +1859,7 @@ void SwXStyle::SetPropertyValue<FN_UNO_IS_AUTO_UPDATE>(const SfxItemPropertySimp o_rStyleBase.getNewBase()->GetFrameFormat()->SetAutoUpdateFormat(bAuto); } template<> -void SwXStyle::SetPropertyValue<FN_UNO_PARA_STYLE_CONDITIONS>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<FN_UNO_PARA_STYLE_CONDITIONS>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { static_assert(COND_COMMAND_COUNT == 28, "invalid size of command count?"); using expectedarg_t = uno::Sequence<beans::NamedValue>; @@ -1895,7 +1895,7 @@ void SwXStyle::SetPropertyValue<FN_UNO_PARA_STYLE_CONDITIONS>(const SfxItemPrope o_rStyleBase.GetItemSet().Put(aCondItem); } template<> -void SwXStyle::SetPropertyValue<FN_UNO_CATEGORY>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<FN_UNO_CATEGORY>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { if(!o_rStyleBase.getNewBase()->IsUserDefined() || !rValue.has<paragraphstyle_t>()) throw lang::IllegalArgumentException(); @@ -1913,7 +1913,7 @@ void SwXStyle::SetPropertyValue<FN_UNO_CATEGORY>(const SfxItemPropertySimpleEntr o_rStyleBase.getNewBase()->SetMask( pUnoToCoreIt->second|SfxStyleSearchBits::UserDefined ); } template<> -void SwXStyle::SetPropertyValue<SID_SWREGISTER_COLLECTION>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<SID_SWREGISTER_COLLECTION>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { OUString sName; rValue >>= sName; @@ -1925,7 +1925,7 @@ void SwXStyle::SetPropertyValue<SID_SWREGISTER_COLLECTION>(const SfxItemProperty o_rStyleBase.GetItemSet().Put(SfxStringItem(SID_SWREGISTER_COLLECTION, aString ) ); } template<> -void SwXStyle::SetPropertyValue<sal_uInt16(RES_TXTATR_CJK_RUBY)>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<sal_uInt16(RES_TXTATR_CJK_RUBY)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { if(MID_RUBY_CHARSTYLE != rEntry.nMemberId) return; @@ -1952,7 +1952,7 @@ void SwXStyle::SetPropertyValue<sal_uInt16(RES_TXTATR_CJK_RUBY)>(const SfxItemPr SetPropertyValue<HINT_BEGIN>(rEntry, rPropSet, rValue, o_rStyleBase); } template<> -void SwXStyle::SetPropertyValue<sal_uInt16(RES_PARATR_DROP)>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<sal_uInt16(RES_PARATR_DROP)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { if(MID_DROPCAP_CHAR_STYLE_NAME != rEntry.nMemberId) { @@ -1981,7 +1981,7 @@ void SwXStyle::SetPropertyValue<sal_uInt16(RES_PARATR_DROP)>(const SfxItemProper rStyleSet.Put(*pDrop); } template<> -void SwXStyle::SetPropertyValue<sal_uInt16(RES_PARATR_NUMRULE)>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) +void SwXStyle::SetPropertyValue<sal_uInt16(RES_PARATR_NUMRULE)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase) { uno::Any aValue(rValue); lcl_TranslateMetric(rEntry, m_pDoc, aValue); @@ -1999,10 +1999,10 @@ void SwXStyle::SetPropertyValue<sal_uInt16(RES_PARATR_NUMRULE)>(const SfxItemPro } } -void SwXStyle::SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase) +void SwXStyle::SetStyleProperty(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, const uno::Any& rValue, SwStyleBase_Impl& rBase) { using propertytype_t = decltype(rEntry.nWID); - using coresetter_t = std::function<void(SwXStyle&, const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any&, SwStyleBase_Impl&)>; + using coresetter_t = std::function<void(SwXStyle&, const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, const uno::Any&, SwStyleBase_Impl&)>; static std::unique_ptr<std::map<propertytype_t, coresetter_t>> pUnoToCore; if(!pUnoToCore) { @@ -2070,7 +2070,7 @@ void SwXStyle::SetPropertyValues_Impl(const uno::Sequence<OUString>& rPropertyNa const uno::Any* pValues = rValues.getConstArray(); for(sal_Int32 nProp = 0; nProp < rPropertyNames.getLength(); ++nProp) { - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(pNames[nProp]); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(pNames[nProp]); if(!pEntry || (!m_bIsConditional && pNames[nProp] == UNO_NAME_PARA_STYLE_CONDITIONS)) throw beans::UnknownPropertyException("Unknown property: " + pNames[nProp], static_cast<cppu::OWeakObject*>(this)); if(pEntry->nFlags & beans::PropertyAttribute::READONLY) @@ -2120,9 +2120,9 @@ void SwXStyle::PrepareStyleBase(SwStyleBase_Impl& rBase) } template<> -uno::Any SwXStyle::GetStyleProperty<HINT_BEGIN>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase); +uno::Any SwXStyle::GetStyleProperty<HINT_BEGIN>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase); template<> -uno::Any SwXStyle::GetStyleProperty<FN_UNO_IS_PHYSICAL>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl&) +uno::Any SwXStyle::GetStyleProperty<FN_UNO_IS_PHYSICAL>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, SwStyleBase_Impl&) { SfxStyleSheetBase* pBase(GetStyleSheetBase()); if(!pBase) @@ -2136,7 +2136,7 @@ uno::Any SwXStyle::GetStyleProperty<FN_UNO_IS_PHYSICAL>(const SfxItemPropertySim return uno::makeAny<bool>(bPhys); } template<> -uno::Any SwXStyle::GetStyleProperty<FN_UNO_HIDDEN>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl&) +uno::Any SwXStyle::GetStyleProperty<FN_UNO_HIDDEN>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, SwStyleBase_Impl&) { SfxStyleSheetBase* pBase(GetStyleSheetBase()); if(!pBase) @@ -2145,7 +2145,7 @@ uno::Any SwXStyle::GetStyleProperty<FN_UNO_HIDDEN>(const SfxItemPropertySimpleEn return uno::makeAny(xBase->IsHidden()); } template<> -uno::Any SwXStyle::GetStyleProperty<FN_UNO_STYLE_INTEROP_GRAB_BAG>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl&) +uno::Any SwXStyle::GetStyleProperty<FN_UNO_STYLE_INTEROP_GRAB_BAG>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, SwStyleBase_Impl&) { SfxStyleSheetBase* pBase(GetStyleSheetBase()); if(!pBase) @@ -2156,7 +2156,7 @@ uno::Any SwXStyle::GetStyleProperty<FN_UNO_STYLE_INTEROP_GRAB_BAG>(const SfxItem return aRet; } template<> -uno::Any SwXStyle::GetStyleProperty<sal_uInt16(RES_PAPER_BIN)>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<sal_uInt16(RES_PAPER_BIN)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); SfxItemSet& rSet = rBase.GetItemSet(); @@ -2171,7 +2171,7 @@ uno::Any SwXStyle::GetStyleProperty<sal_uInt16(RES_PAPER_BIN)>(const SfxItemProp return uno::makeAny(pPrinter->GetPaperBinName(nBin)); } template<> -uno::Any SwXStyle::GetStyleProperty<FN_UNO_NUM_RULES>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<FN_UNO_NUM_RULES>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); const SwNumRule* pRule = rBase.getNewBase()->GetNumRule(); @@ -2180,14 +2180,14 @@ uno::Any SwXStyle::GetStyleProperty<FN_UNO_NUM_RULES>(const SfxItemPropertySimpl return uno::makeAny<uno::Reference<container::XIndexReplace>>(xRules); } template<> -uno::Any SwXStyle::GetStyleProperty<sal_uInt16(RES_PARATR_OUTLINELEVEL)>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<sal_uInt16(RES_PARATR_OUTLINELEVEL)>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); SAL_WARN_IF(SfxStyleFamily::Para != GetFamily(), "sw.uno", "only paras"); return uno::makeAny<sal_Int16>(rBase.getNewBase()->GetCollection()->GetAttrOutlineLevel()); } template<> -uno::Any SwXStyle::GetStyleProperty<FN_UNO_FOLLOW_STYLE>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<FN_UNO_FOLLOW_STYLE>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); OUString aString; @@ -2195,7 +2195,7 @@ uno::Any SwXStyle::GetStyleProperty<FN_UNO_FOLLOW_STYLE>(const SfxItemPropertySi return uno::makeAny(aString); } template<> -uno::Any SwXStyle::GetStyleProperty<sal_uInt16(RES_PAGEDESC)>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<sal_uInt16(RES_PAGEDESC)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); if(MID_PAGEDESC_PAGEDESCNAME != rEntry.nMemberId) @@ -2212,7 +2212,7 @@ uno::Any SwXStyle::GetStyleProperty<sal_uInt16(RES_PAGEDESC)>(const SfxItemPrope return uno::makeAny(aString); } template<> -uno::Any SwXStyle::GetStyleProperty<FN_UNO_IS_AUTO_UPDATE>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<FN_UNO_IS_AUTO_UPDATE>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); switch(GetFamily()) @@ -2223,13 +2223,13 @@ uno::Any SwXStyle::GetStyleProperty<FN_UNO_IS_AUTO_UPDATE>(const SfxItemProperty } } template<> -uno::Any SwXStyle::GetStyleProperty<FN_UNO_DISPLAY_NAME>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<FN_UNO_DISPLAY_NAME>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); return uno::makeAny(rBase.getNewBase()->GetName()); } template<> -uno::Any SwXStyle::GetStyleProperty<FN_UNO_PARA_STYLE_CONDITIONS>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<FN_UNO_PARA_STYLE_CONDITIONS>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); static_assert(COND_COMMAND_COUNT == 28, "invalid size of command count?"); @@ -2259,7 +2259,7 @@ uno::Any SwXStyle::GetStyleProperty<FN_UNO_PARA_STYLE_CONDITIONS>(const SfxItemP return uno::makeAny(aSeq); } template<> -uno::Any SwXStyle::GetStyleProperty<FN_UNO_CATEGORY>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<FN_UNO_CATEGORY>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); static std::unique_ptr<std::map<collectionbits_t, paragraphstyle_t>> pUnoToCore; @@ -2277,7 +2277,7 @@ uno::Any SwXStyle::GetStyleProperty<FN_UNO_CATEGORY>(const SfxItemPropertySimple return uno::makeAny(pUnoToCoreIt->second); } template<> -uno::Any SwXStyle::GetStyleProperty<SID_SWREGISTER_COLLECTION>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<SID_SWREGISTER_COLLECTION>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); const SwPageDesc *pPageDesc = rBase.getNewBase()->GetPageDesc(); @@ -2291,7 +2291,7 @@ uno::Any SwXStyle::GetStyleProperty<SID_SWREGISTER_COLLECTION>(const SfxItemProp return uno::makeAny(aName); } template<> -uno::Any SwXStyle::GetStyleProperty<sal_uInt16(RES_BACKGROUND)>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<sal_uInt16(RES_BACKGROUND)>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); const SfxItemSet& rSet = rBase.GetItemSet(); @@ -2302,7 +2302,7 @@ uno::Any SwXStyle::GetStyleProperty<sal_uInt16(RES_BACKGROUND)>(const SfxItemPro return aResult; } template<> -uno::Any SwXStyle::GetStyleProperty<OWN_ATTR_FILLBMP_MODE>(const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<OWN_ATTR_FILLBMP_MODE>(const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); const SfxItemSet& rSet = rBase.GetItemSet(); @@ -2313,7 +2313,7 @@ uno::Any SwXStyle::GetStyleProperty<OWN_ATTR_FILLBMP_MODE>(const SfxItemProperty return uno::makeAny(drawing::BitmapMode_NO_REPEAT); } template<> -uno::Any SwXStyle::GetStyleProperty<HINT_BEGIN>(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty<HINT_BEGIN>(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase) { PrepareStyleBase(rBase); SfxItemSet& rSet = rBase.GetItemSet(); @@ -2339,10 +2339,10 @@ uno::Any SwXStyle::GetStyleProperty<HINT_BEGIN>(const SfxItemPropertySimpleEntry return aResult; } -uno::Any SwXStyle::GetStyleProperty_Impl(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase) +uno::Any SwXStyle::GetStyleProperty_Impl(const SfxItemPropertyMapEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase) { using propertytype_t = decltype(rEntry.nWID); - using coresetter_t = std::function<uno::Any(SwXStyle&, const SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl&)>; + using coresetter_t = std::function<uno::Any(SwXStyle&, const SfxItemPropertyMapEntry&, const SfxItemPropertySet&, SwStyleBase_Impl&)>; static std::unique_ptr<std::map<propertytype_t, coresetter_t>> pUnoToCore; if(!pUnoToCore) { @@ -2374,7 +2374,7 @@ uno::Any SwXStyle::GetStyleProperty_Impl(const SfxItemPropertySimpleEntry& rEntr uno::Any SwXStyle::GetPropertyValue_Impl(const SfxItemPropertySet* pPropSet, SwStyleBase_Impl& rBase, const OUString& rPropertyName) { const SfxItemPropertyMap& rMap = pPropSet->getPropertyMap(); - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropertyName); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(rPropertyName); if(!pEntry || (!m_bIsConditional && rPropertyName == UNO_NAME_PARA_STYLE_CONDITIONS)) throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast<cppu::OWeakObject*>(this)); if(m_pBasePool) @@ -2514,7 +2514,7 @@ uno::Sequence<beans::PropertyState> SwXStyle::getPropertyStates(const uno::Seque for(sal_Int32 i = 0; i < rPropertyNames.getLength(); ++i) { const OUString sPropName = pNames[i]; - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(sPropName); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(sPropName); if(!pEntry) throw beans::UnknownPropertyException("Unknown property: " + sPropName, static_cast<cppu::OWeakObject*>(this)); @@ -2629,7 +2629,7 @@ void SAL_CALL SwXStyle::setPropertiesToDefault(const uno::Sequence<OUString>& aP const SfxItemPropertyMap &rMap = pPropSet->getPropertyMap(); for(const auto& rName : aPropertyNames) { - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rName); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(rName); if(!pEntry) throw beans::UnknownPropertyException("Unknown property: " + rName, static_cast<cppu::OWeakObject*>(this)); if(pEntry->nWID == FN_UNO_FOLLOW_STYLE || pEntry->nWID == FN_UNO_NUM_RULES) @@ -2748,7 +2748,7 @@ uno::Sequence<uno::Any> SAL_CALL SwXStyle::getPropertyDefaults(const uno::Sequen const SfxItemSet &rSet = xStyle->GetItemSet(), *pParentSet = rSet.GetParent(); for(sal_Int32 i = 0; i < nCount; ++i) { - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(aPropertyNames[i]); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(aPropertyNames[i]); if(!pEntry) throw beans::UnknownPropertyException("Unknown property: " + aPropertyNames[i], static_cast < cppu::OWeakObject * >(this)); @@ -2812,7 +2812,7 @@ SwXPageStyle::SwXPageStyle(SwDocShell* pDocSh) : SwXStyle(pDocSh->GetDoc(), SfxStyleFamily::Page) { } -void SwXStyle::PutItemToSet(const SvxSetItem* pSetItem, const SfxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry& rEntry, const uno::Any& rVal, SwStyleBase_Impl& rBaseImpl) +void SwXStyle::PutItemToSet(const SvxSetItem* pSetItem, const SfxItemPropertySet& rPropSet, const SfxItemPropertyMapEntry& rEntry, const uno::Any& rVal, SwStyleBase_Impl& rBaseImpl) { // create a new SvxSetItem and get it's ItemSet as new target const std::unique_ptr<SvxSetItem> pNewSetItem(pSetItem->Clone()); @@ -2862,7 +2862,7 @@ void SwXPageStyle::SetPropertyValues_Impl(const uno::Sequence<OUString>& rProper for(sal_Int32 nProp = 0; nProp < rPropertyNames.getLength(); ++nProp) { const OUString& rPropName = rPropertyNames[nProp]; - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropName); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(rPropName); if(!pEntry) throw beans::UnknownPropertyException("Unknown property: " + rPropName, static_cast<cppu::OWeakObject*>(this)); @@ -3103,7 +3103,7 @@ uno::Sequence<uno::Any> SwXPageStyle::GetPropertyValues_Impl(const uno::Sequence for(sal_Int32 nProp = 0; nProp < nLength; ++nProp) { const OUString& rPropName = rPropertyNames[nProp]; - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropName); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(rPropName); if (!pEntry) throw beans::UnknownPropertyException("Unknown property: " + rPropName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -3595,7 +3595,7 @@ uno::Reference< style::XAutoStyle > SwXAutoStyleFamily::insertStyle( { const OUString& rPropName = rValue.Name; uno::Any aValue(rValue.Value); - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropName); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(rPropName); if (!pEntry) { @@ -3982,7 +3982,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl( for( sal_Int32 i = 0; i < nLen; ++i ) { const OUString sPropName = pNames[i]; - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(sPropName); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(sPropName); if(!pEntry) { throw beans::UnknownPropertyException("Unknown property: " + sPropName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -4179,7 +4179,7 @@ uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates( for(sal_Int32 i = 0; i < rPropertyNames.getLength(); i++) { const OUString sPropName = pNames[i]; - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(sPropName); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(sPropName); if(!pEntry) { throw beans::UnknownPropertyException("Unknown property: " + sPropName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -4278,13 +4278,13 @@ uno::Sequence< beans::PropertyValue > SwXAutoStyle::getProperties() // TODO: Optimize - and fix! the old iteration filled each WhichId // only once but there are more properties than WhichIds - for( const auto& rPair : rMap.getPropertyEntries() ) + for( const auto pEntry : rMap.getPropertyEntries() ) { - if ( rPair.second.nWID == nWID ) + if ( pEntry->nWID == nWID ) { beans::PropertyValue aPropertyValue; - aPropertyValue.Name = rPair.first; - pItem->QueryValue( aPropertyValue.Value, rPair.second.nMemberId ); + aPropertyValue.Name = pEntry->aName; + pItem->QueryValue( aPropertyValue.Value, pEntry->nMemberId ); aPropertyVector.push_back( aPropertyValue ); } } @@ -4861,7 +4861,7 @@ css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL SwXTextCellStyle::get void SAL_CALL SwXTextCellStyle::setPropertyValue(const OUString& rPropertyName, const css::uno::Any& aValue) { SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry *const pEntry = aSwMapProvider.GetPropertySet(PROPERTY_MAP_CELL_STYLE)->getPropertyMap().getByName(rPropertyName); + const SfxItemPropertyMapEntry *const pEntry = aSwMapProvider.GetPropertySet(PROPERTY_MAP_CELL_STYLE)->getPropertyMap().getByName(rPropertyName); if(pEntry) { switch(pEntry->nWID) @@ -5051,7 +5051,7 @@ css::uno::Any SAL_CALL SwXTextCellStyle::getPropertyValue(const OUString& rPrope { SolarMutexGuard aGuard; uno::Any aRet; - const SfxItemPropertySimpleEntry *const pEntry = aSwMapProvider.GetPropertySet(PROPERTY_MAP_CELL_STYLE)->getPropertyMap().getByName(rPropertyName); + const SfxItemPropertyMapEntry *const pEntry = aSwMapProvider.GetPropertySet(PROPERTY_MAP_CELL_STYLE)->getPropertyMap().getByName(rPropertyName); if(pEntry) { switch(pEntry->nWID) @@ -5251,7 +5251,7 @@ css::uno::Sequence<css::beans::PropertyState> SAL_CALL SwXTextCellStyle::getProp for(sal_Int32 i=0; i < aPropertyNames.getLength(); ++i) { const OUString sPropName = pNames[i]; - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(sPropName); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(sPropName); if(pEntry) { uno::Any aAny1, aAny2; @@ -5395,7 +5395,7 @@ void SAL_CALL SwXTextCellStyle::setPropertyToDefault(const OUString& rPropertyNa SolarMutexGuard aGuard; const SwBoxAutoFormat& rDefaultBoxFormat = SwTableAutoFormat::GetDefaultBoxFormat(); const SfxItemPropertyMap& rMap = aSwMapProvider.GetPropertySet(PROPERTY_MAP_CELL_STYLE)->getPropertyMap(); - const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropertyName); + const SfxItemPropertyMapEntry* pEntry = rMap.getByName(rPropertyName); if(!pEntry) return; diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index e78d66974702..757ca7e54ead 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -184,7 +184,7 @@ static bool lcl_LineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSv /// @throws lang::IllegalArgumentException /// @throws uno::RuntimeException static void lcl_SetSpecialProperty(SwFrameFormat* pFormat, - const SfxItemPropertySimpleEntry* pEntry, + const SfxItemPropertyMapEntry* pEntry, const uno::Any& aValue) { // special treatment for "non-items" @@ -263,7 +263,7 @@ static void lcl_SetSpecialProperty(SwFrameFormat* pFormat, } } -static uno::Any lcl_GetSpecialProperty(SwFrameFormat* pFormat, const SfxItemPropertySimpleEntry* pEntry ) +static uno::Any lcl_GetSpecialProperty(SwFrameFormat* pFormat, const SfxItemPropertyMapEntry* pEntry ) { switch(pEntry->nWID) { @@ -1292,7 +1292,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno: } else { - const SfxItemPropertySimpleEntry* pEntry = + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); SwDoc* pDoc = pFormat->GetDoc(); if (!pEntry) @@ -1351,7 +1351,7 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) SwTableLine* pLn = SwXTextTableRow::FindLine(pTable, pLine); if(pLn) { - const SfxItemPropertySimpleEntry* pEntry = + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName); if (!pEntry) throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -2483,7 +2483,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An SwFrameFormat* pFormat = GetFrameFormat(); if(!aValue.hasValue()) throw lang::IllegalArgumentException(); - const SfxItemPropertySimpleEntry* pEntry = + const SfxItemPropertyMapEntry* pEntry = m_pImpl->m_pPropSet->getPropertyMap().getByName(rPropertyName); if( !pEntry ) throw lang::IllegalArgumentException(); @@ -2737,7 +2737,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) SolarMutexGuard aGuard; uno::Any aRet; SwFrameFormat* pFormat = GetFrameFormat(); - const SfxItemPropertySimpleEntry* pEntry = + const SfxItemPropertyMapEntry* pEntry = m_pImpl->m_pPropSet->getPropertyMap().getByName(rPropertyName); if (!pEntry) @@ -3362,7 +3362,7 @@ SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV if(!pFormat) return; - const SfxItemPropertySimpleEntry *const pEntry = + const SfxItemPropertyMapEntry *const pEntry = m_pImpl->m_pPropSet->getPropertyMap().getByName(rPropertyName); if(!pEntry) throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); @@ -3480,7 +3480,7 @@ uno::Any SAL_CALL SwXCellRange::getPropertyValue(const OUString& rPropertyName) SwFrameFormat *const pFormat = m_pImpl->GetFrameFormat(); if(pFormat) { - const SfxItemPropertySimpleEntry *const pEntry = + const SfxItemPropertyMapEntry *const pEntry = m_pImpl->m_pPropSet->getPropertyMap().getByName(rPropertyName); if(!pEntry) throw beans::UnknownPropertyException("Unknown property: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 6542d96ca277..32cadcff761b 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -1120,7 +1120,7 @@ SwXText::getPropertyValue( throw uno::RuntimeException(); } - SfxItemPropertySimpleEntry const*const pEntry = + SfxItemPropertyMapEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName); if (!pEntry) { diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index ef2087d50e1f..754f4debef14 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -572,7 +572,7 @@ void SwXAutoTextGroup::setPropertyValue( const OUString& rPropertyName, const uno::Any& aValue) { SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = pPropSet->getPropertyMap().getByName( rPropertyName ); if(!pEntry) throw beans::UnknownPropertyException(rPropertyName); @@ -600,7 +600,7 @@ void SwXAutoTextGroup::setPropertyValue( uno::Any SwXAutoTextGroup::getPropertyValue(const OUString& rPropertyName) { SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( rPropertyName); + const SfxItemPropertyMapEntry* pEntry = pPropSet->getPropertyMap().getByName( rPropertyName); if(!pEntry) throw beans::UnknownPropertyException(rPropertyName); diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index cb4df33075c6..8a15448d8598 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -867,7 +867,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue( { SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pCur = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pCur = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pCur) throw UnknownPropertyException(rPropertyName); else if (pCur->nFlags & PropertyAttribute::READONLY) @@ -1022,7 +1022,7 @@ uno::Any SAL_CALL SwXMailMerge::getPropertyValue( Any aRet; - const SfxItemPropertySimpleEntry* pCur = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pCur = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pCur) throw UnknownPropertyException(rPropertyName); @@ -1073,7 +1073,7 @@ void SAL_CALL SwXMailMerge::addPropertyChangeListener( SolarMutexGuard aGuard; if (!m_bDisposing && rListener.is()) { - const SfxItemPropertySimpleEntry* pCur = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pCur = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pCur) throw UnknownPropertyException(rPropertyName); m_aPropListeners.addInterface( pCur->nWID, rListener ); @@ -1087,7 +1087,7 @@ void SAL_CALL SwXMailMerge::removePropertyChangeListener( SolarMutexGuard aGuard; if (!m_bDisposing && rListener.is()) { - const SfxItemPropertySimpleEntry* pCur = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pCur = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pCur) throw UnknownPropertyException(rPropertyName); m_aPropListeners.removeInterface( pCur->nWID, rListener ); diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index f7461860a9ba..65ae31a99767 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -1814,7 +1814,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, const Any& if(!IsValid()) throw DisposedException("", static_cast< XTextDocument* >(this)); - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName); if(!pEntry) throw UnknownPropertyException(rPropertyName); @@ -2007,7 +2007,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) if(!IsValid()) throw DisposedException("", static_cast< XTextDocument* >(this)); - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName); if(!pEntry) throw UnknownPropertyException(rPropertyName); @@ -2253,7 +2253,7 @@ PropertyState SAL_CALL SwXTextDocument::getPropertyState( const OUString& rPrope if(!IsValid()) throw DisposedException("", static_cast< XTextDocument* >(this)); - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName); if(!pEntry) throw UnknownPropertyException(rPropertyName); return PropertyState_DIRECT_VALUE; @@ -2276,7 +2276,7 @@ void SAL_CALL SwXTextDocument::setPropertyToDefault( const OUString& rPropertyNa if(!IsValid()) throw DisposedException("", static_cast< XTextDocument* >(this)); - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName); if(!pEntry) throw UnknownPropertyException(rPropertyName); switch(pEntry->nWID) @@ -2291,7 +2291,7 @@ Any SAL_CALL SwXTextDocument::getPropertyDefault( const OUString& rPropertyName if(!IsValid()) throw DisposedException("", static_cast< XTextDocument* >(this)); - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName); if(!pEntry) throw UnknownPropertyException(rPropertyName); Any aAny; diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index 60fefb112594..1874bec44ae3 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -755,7 +755,7 @@ void SAL_CALL SwXTextView::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) { SolarMutexGuard aGuard; - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pEntry) throw UnknownPropertyException(rPropertyName); else if (pEntry->nFlags & PropertyAttribute::READONLY) @@ -792,7 +792,7 @@ uno::Any SAL_CALL SwXTextView::getPropertyValue( Any aRet; - const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); + const SfxItemPropertyMapEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName ); if (!pEntry) throw UnknownPropertyException(rPropertyName); diff --git a/vcl/source/uitest/uno/uiobject_uno.cxx b/vcl/source/uitest/uno/uiobject_uno.cxx index 593f4a4c11fe..56cd807552f5 100644 --- a/vcl/source/uitest/uno/uiobject_uno.cxx +++ b/vcl/source/uitest/uno/uiobject_uno.cxx @@ -13,6 +13,7 @@ #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> #include <vcl/idle.hxx> +#include <vcl/window.hxx> #include <set> diff --git a/vcl/source/uitest/uno/uitest_uno.cxx b/vcl/source/uitest/uno/uitest_uno.cxx index d0d70a816f0f..4e5a6e0e0391 100644 --- a/vcl/source/uitest/uno/uitest_uno.cxx +++ b/vcl/source/uitest/uno/uitest_uno.cxx @@ -18,6 +18,7 @@ #include <vcl/uitest/uitest.hxx> #include <vcl/svapp.hxx> +#include <vcl/window.hxx> #include "uiobject_uno.hxx" |