diff options
Diffstat (limited to 'sw/source/core/txtnode/thints.cxx')
| -rw-r--r-- | sw/source/core/txtnode/thints.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 0c774f83677f..edad6745b2e3 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -2018,10 +2018,11 @@ static void lcl_MergeAttr( SfxItemSet& rSet, const SfxPoolItem& rAttr ) sal_uInt16 nWhich = aIter.FirstWhich(); while( nWhich ) { + const SfxPoolItem* pItem = nullptr; if( ( nWhich < RES_CHRATR_END || RES_TXTATR_UNKNOWN_CONTAINER == nWhich ) && - ( SfxItemState::SET == pCFSet->GetItemState( nWhich ) ) ) - rSet.Put( pCFSet->Get( nWhich ) ); + ( SfxItemState::SET == aIter.GetItemState( true, &pItem ) ) ) + rSet.Put( *pItem ); nWhich = aIter.NextWhich(); } } @@ -2043,10 +2044,11 @@ static void lcl_MergeAttr_ExpandChrFormat( SfxItemSet& rSet, const SfxPoolItem& sal_uInt16 nWhich = aIter.FirstWhich(); while( nWhich ) { + const SfxPoolItem* pItem = nullptr; if( ( nWhich < RES_CHRATR_END || ( RES_TXTATR_AUTOFMT == rAttr.Which() && RES_TXTATR_UNKNOWN_CONTAINER == nWhich ) ) && - ( SfxItemState::SET == pCFSet->GetItemState( nWhich ) ) ) - rSet.Put( pCFSet->Get( nWhich ) ); + ( SfxItemState::SET == aIter.GetItemState( true, &pItem ) ) ) + rSet.Put( *pItem ); nWhich = aIter.NextWhich(); } } |