diff options
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/func/fupage.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 4660c1d02d12..9401a56b30ec 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -373,7 +373,7 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window* pParent, const SfxRequest& if( pTempSet->GetItemState( i ) == SfxItemState::DEFAULT ) pTempSet->Put( aMergedAttr.Get( i ) ); else - if( aMergedAttr.GetItem( i ) != pTempSet->GetItem( i ) ) + if( !SfxPoolItem::areSame(aMergedAttr.GetItem( i ), pTempSet->GetItem( i ) ) ) bChanges = true; } } diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 77aeb444979c..802aab269e46 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1383,12 +1383,13 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property for(sal_uInt16 nWhichId : aWhichIds) { - sal_uInt32 nItems = rPool.GetItemCount2( nWhichId ); + const registeredSfxPoolItems& rSurrogates(rPool.GetItemSurrogates(nWhichId)); + const sal_uInt32 nItems(rSurrogates.size()); aSeq.realloc( aSeq.getLength() + nItems*5 + 5 ); auto pSeq = aSeq.getArray(); - for (const SfxPoolItem* pItem : rPool.GetItemSurrogates(nWhichId)) + for (const SfxPoolItem* pItem : rSurrogates) { const SvxFontItem *pFont = static_cast<const SvxFontItem *>(pItem); |