diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/xml/sdtransform.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drawview.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsf.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index 13e3a957e27d..4e296eaf6282 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -225,7 +225,7 @@ void SdTransformOOo2xDocument::transformTextShape( SdrTextObj& rTextShape ) // now set all none hard attributes from the style while(nWhich) { - if(SfxItemState::SET != aParaSet.GetItemState(nWhich)) + if(SfxItemState::SET != aIter.GetItemState()) { aParaSet.Put(rStyleSet.Get(nWhich)); bItemChange = true; diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index dd711aeaef49..e4cdf010736c 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -363,7 +363,7 @@ void DrawView::SetMasterAttributes( SdrObject* pObject, const SdPage& rPage, Sfx sal_uInt16 nWhich(aWhichIter.FirstWhich()); while( nWhich ) { - if( SfxItemState::SET == rSet.GetItemState( nWhich ) ) + if( SfxItemState::SET == aWhichIter.GetItemState() ) aTempSet.ClearItem( nWhich ); nWhich = aWhichIter.NextWhich(); } @@ -390,7 +390,7 @@ void DrawView::SetMasterAttributes( SdrObject* pObject, const SdPage& rPage, Sfx sal_uInt16 nWhich(aWhichIter.FirstWhich()); while( nWhich ) { - if( SfxItemState::SET == rSet.GetItemState( nWhich ) ) + if( SfxItemState::SET == aWhichIter.GetItemState() ) pObject->ClearMergedItem( nWhich ); nWhich = aWhichIter.NextWhich(); } diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index f23bd042ce23..ae47828e8be5 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -733,7 +733,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) while( nWhich ) { if (nWhich >= XATTR_LINE_FIRST && nWhich <= XATTR_LINE_LAST - && SfxItemState::DEFAULT == pSet->GetItemState(nWhich) ) + && SfxItemState::DEFAULT == aNewIter.GetItemState() ) { rSet.ClearItem( nWhich ); rSet.DisableItem( nWhich ); |