diff options
Diffstat (limited to 'svx/source/xoutdev/xattrbmp.cxx')
| -rw-r--r-- | svx/source/xoutdev/xattrbmp.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 797e08979c04..674f8f63727a 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -513,7 +513,9 @@ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt } if( bSetURL ) { - maGraphicObject = GraphicObject::CreateGraphicObjectFromURL(aURL); + GraphicObject aGraphicObject = GraphicObject::CreateGraphicObjectFromURL(aURL); + if( aGraphicObject.GetType() != GRAPHIC_NONE ) + maGraphicObject = aGraphicObject; // #121194# Prefer GraphicObject over bitmap object if both are provided if(bSetBitmap && GRAPHIC_NONE != maGraphicObject.GetType()) |