diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-10 11:22:59 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-10 11:22:59 +0000 |
| commit | 1a3cd34bee74faa0e1dfdac9107fa660705ed3e6 (patch) | |
| tree | 752bb793fa7724d009abe4c6aee13e5c430d405b /sd/source/ui/unoidl | |
| parent | 4081feab518a812787866fa18abba877962c835a (diff) | |
INTEGRATION: CWS xmlfilter02 (1.15.32); FILE MERGED
2007/06/27 14:55:12 sj 1.15.32.1: fixed problem when setting Background graphic using not the implementation property set
Diffstat (limited to 'sd/source/ui/unoidl')
| -rw-r--r-- | sd/source/ui/unoidl/unopback.cxx | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 8e64dee0bfb7..5d3df9684c11 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unopback.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2006-12-12 19:02:01 $ + * last change: $Author: obo $ $Date: 2008-01-10 12:22:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -166,7 +166,22 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) if( pAny ) { OUString aPropertyName( OUString::createFromAscii(pMap->pName)); - setPropertyValue( aPropertyName, *pAny ); + if ( pMap->nWID == XATTR_FILLBITMAP ) + { + 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 ) ) + { + setPropertyValue( aPropertyName, *pAny ); + } + else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) && + ( ( pMap->nMemberId == MID_NAME ) || ( pMap->nMemberId == MID_GRAFURL ) ) ) + { + setPropertyValue( aPropertyName, *pAny ); + } + } + else + setPropertyValue( aPropertyName, *pAny ); } pMap++; } |