Skip to content

C
core
Kaydet (Commit) 395da341 authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann
Dosyalara gözat
Seçenekler

#i10000# build fix

üst bfd27a0f
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 8 deletions
sd/source/ui/unoidl/unopback.cxx
Dosyayı görüntüle @ 395da341
...@@ -136,24 +136,25 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) ...@@ -136,24 +136,25 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
uno::Any* pAny; uno::Any* pAny;
PropertyEntryVector_t aProperties = mpPropSet->getPropertyMap()->getPropertyEntries(); PropertyEntryVector_t aProperties = mpPropSet->getPropertyMap()->getPropertyEntries();
PropertyEntryVector_t::const_iterator aIt = aProperties.begin(); PropertyEntryVector_t::const_iterator aIt = aProperties.begin();
while( aIt != aProperties.end() ) while( aIt != aProperties.end() )
{ {
pAny = mpPropSet->GetUsrAnyForID( aIt->nWID ); pAny = mpPropSet->GetUsrAnyForID( aIt->nWID );
if( pAny ) if( pAny )
{ {
OUString aPropertyName( OUString::createFromAscii(pMap->pName)); OUString aPropertyName( aIt->sName );
switch( pMap->nWID ) switch( aIt->nWID )
{ {
case XATTR_FILLFLOATTRANSPARENCE : case XATTR_FILLFLOATTRANSPARENCE :
case XATTR_FILLGRADIENT : case XATTR_FILLGRADIENT :
{ {
if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::awt::Gradient*)0) ) if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::awt::Gradient*)0) )
&& ( pMap->nMemberId == MID_FILLGRADIENT ) ) && ( aIt->nMemberId == MID_FILLGRADIENT ) )
{ {
setPropertyValue( aPropertyName, *pAny ); setPropertyValue( aPropertyName, *pAny );
} }
else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) && else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) &&
( pMap->nMemberId == MID_NAME ) ) ( aIt->nMemberId == MID_NAME ) )
{ {
setPropertyValue( aPropertyName, *pAny ); setPropertyValue( aPropertyName, *pAny );
} }
...@@ -162,12 +163,12 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) ...@@ -162,12 +163,12 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
case XATTR_FILLHATCH : case XATTR_FILLHATCH :
{ {
if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::drawing::Hatch*)0) ) if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::drawing::Hatch*)0) )
&& ( pMap->nMemberId == MID_FILLHATCH ) ) && ( aIt->nMemberId == MID_FILLHATCH ) )
{ {
setPropertyValue( aPropertyName, *pAny ); setPropertyValue( aPropertyName, *pAny );
} }
else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) && else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) &&
( pMap->nMemberId == MID_NAME ) ) ( aIt->nMemberId == MID_NAME ) )
{ {
setPropertyValue( aPropertyName, *pAny ); setPropertyValue( aPropertyName, *pAny );
} }
...@@ -177,12 +178,12 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) ...@@ -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) ) || 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) ) ) && ( 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 ); setPropertyValue( aPropertyName, *pAny );
} }
else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) && 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 ); setPropertyValue( aPropertyName, *pAny );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment