diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-02-17 17:25:50 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2018-02-18 08:57:07 +0100 |
| commit | cea0ceff755d57ad3feaffda9cff82f742ea7b82 (patch) | |
| tree | d130d986be437aeafd15afb3d21e33b1e06c9d52 /sd | |
| parent | 75ab4bed721e1f4dfff22419867303a2f1b38354 (diff) | |
remove use of FillBitmapURL and use FillBitmap as the alternative
This is under the ongoing work to get rit of all usage of
GraphicObject URLs
Change-Id: I900e435ac36a4012ec36a2f0c1d909982c82660a
Reviewed-on: https://gerrit.libreoffice.org/49895
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/unoidl/unopback.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 97f6c5e984f7..0c7f82daaa2d 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -146,14 +146,13 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) break; case XATTR_FILLBITMAP : { - if ( ( ( pAny->getValueType() == cppu::UnoType<css::awt::XBitmap>::get()) || - ( pAny->getValueType() == cppu::UnoType<css::graphic::XGraphic>::get()) ) && - ( aIt->nMemberId == MID_BITMAP ) ) + if (aIt->nMemberId == MID_BITMAP && + (pAny->getValueType() == cppu::UnoType<css::awt::XBitmap>::get() || + pAny->getValueType() == cppu::UnoType<css::graphic::XGraphic>::get())) { setPropertyValue( aPropertyName, *pAny ); } - else if ( ( pAny->getValueType() == ::cppu::UnoType<OUString>::get() ) && - ( ( aIt->nMemberId == MID_NAME ) || ( aIt->nMemberId == MID_GRAFURL ) ) ) + else if (pAny->getValueType() == ::cppu::UnoType<OUString>::get() && aIt->nMemberId == MID_NAME) { setPropertyValue( aPropertyName, *pAny ); } |