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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/xoutdev/xattrbmp.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 6bb58e9707bb..8e6e5afb18a8 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -274,8 +274,7 @@ bool XFillBitmapItem::QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId) const aInternalName = GetName(); } - if( nMemberId == MID_GRAFURL || - nMemberId == 0 ) + if (nMemberId == MID_GRAFURL) { aURL = UNO_NAME_GRAPHOBJ_URLPREFIX; aURL += OStringToOUString( @@ -302,10 +301,8 @@ bool XFillBitmapItem::QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId) const aPropSeq[0].Name = "Name"; aPropSeq[0].Value <<= aInternalName; - aPropSeq[1].Name = "FillBitmapURL"; - aPropSeq[1].Value <<= aURL; - aPropSeq[2].Name = "Bitmap"; - aPropSeq[2].Value <<= xBmp; + aPropSeq[1].Name = "Bitmap"; + aPropSeq[1].Value <<= xBmp; rVal <<= aPropSeq; } @@ -328,8 +325,6 @@ bool XFillBitmapItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) if( nMemberId == MID_NAME ) bSetName = (rVal >>= aName); - else if( nMemberId == MID_GRAFURL ) - bSetURL = (rVal >>= aURL); else if( nMemberId == MID_BITMAP ) { bSetBitmap = (rVal >>= xBmp); @@ -346,8 +341,6 @@ bool XFillBitmapItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { if ( aPropSeq[n].Name == "Name" ) bSetName = (aPropSeq[n].Value >>= aName); - else if ( aPropSeq[n].Name == "FillBitmapURL" ) - bSetURL = (aPropSeq[n].Value >>= aURL); else if ( aPropSeq[n].Name == "Bitmap" ) bSetBitmap = (aPropSeq[n].Value >>= xBmp); } |