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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 8d4b055f6a24..e585b787b866 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -587,7 +587,7 @@ void EscherPropertyContainer::CreateFillProperties( case drawing::FillStyle_BITMAP : { - CreateGraphicProperties( rXPropSet, "FillBitmapURL", true ); + CreateGraphicProperties(rXPropSet, "FillBitmap", true); AddOpt( ESCHER_Prop_fNoFillHitTest, 0x140014 ); AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor ); } @@ -1445,7 +1445,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(const uno::Reference<beans } } } - else if ( rSource == "Bitmap" ) + else if (rSource == "Bitmap" || rSource == "FillBitmap") { uno::Reference<awt::XBitmap> xBitmap(aAny, uno::UNO_QUERY); if (xBitmap.is()) @@ -1461,10 +1461,6 @@ bool EscherPropertyContainer::CreateGraphicProperties(const uno::Reference<beans } } } - else if ( rSource == "FillBitmapURL" ) - { - aGraphicUrl = *o3tl::doAccess<OUString>(aAny); - } else if ( rSource == "GraphicURL" ) { aGraphicUrl = *o3tl::doAccess<OUString>(aAny); |