diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-06-22 13:21:25 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-06-22 13:21:25 +0000 |
| commit | 395da34181995fe664fcb668d89f9d072802576e (patch) | |
| tree | 2690e911e07669c3a170757b53a589d8da3c44b2 /sd | |
| parent | bfd27a0faf82e182834e19ab7d3957fb1aef1393 (diff) | |
#i10000# build fix
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/unoidl/unopback.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 92bdc6f7f886..c224e9bf4db2 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -136,24 +136,25 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) uno::Any* pAny; PropertyEntryVector_t aProperties = mpPropSet->getPropertyMap()->getPropertyEntries(); PropertyEntryVector_t::const_iterator aIt = aProperties.begin(); + while( aIt != aProperties.end() ) { pAny = mpPropSet->GetUsrAnyForID( aIt->nWID ); if( pAny ) { - OUString aPropertyName( OUString::createFromAscii(pMap->pName)); - switch( pMap->nWID ) + OUString aPropertyName( aIt->sName ); + switch( aIt->nWID ) { case XATTR_FILLFLOATTRANSPARENCE : case XATTR_FILLGRADIENT : { if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::awt::Gradient*)0) ) - && ( pMap->nMemberId == MID_FILLGRADIENT ) ) + && ( aIt->nMemberId == MID_FILLGRADIENT ) ) { setPropertyValue( aPropertyName, *pAny ); } else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) && - ( pMap->nMemberId == MID_NAME ) ) + ( aIt->nMemberId == MID_NAME ) ) { setPropertyValue( aPropertyName, *pAny ); } @@ -162,12 +163,12 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) case XATTR_FILLHATCH : { if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::drawing::Hatch*)0) ) - && ( pMap->nMemberId == MID_FILLHATCH ) ) + && ( aIt->nMemberId == MID_FILLHATCH ) ) { setPropertyValue( aPropertyName, *pAny ); } else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) && - ( pMap->nMemberId == MID_NAME ) ) + ( aIt->nMemberId == MID_NAME ) ) { setPropertyValue( aPropertyName, *pAny ); } @@ -177,12 +178,12 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) { if ( ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0) ) || ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >*)0) ) ) && - ( pMap->nMemberId == MID_BITMAP ) ) + ( aIt->nMemberId == MID_BITMAP ) ) { setPropertyValue( aPropertyName, *pAny ); } else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) && - ( ( pMap->nMemberId == MID_NAME ) || ( pMap->nMemberId == MID_GRAFURL ) ) ) + ( ( aIt->nMemberId == MID_NAME ) || ( aIt->nMemberId == MID_GRAFURL ) ) ) { setPropertyValue( aPropertyName, *pAny ); } |