diff options
| author | Muthu Subramanian <sumuthu@collabora.com> | 2014-03-06 15:53:07 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@collabora.com> | 2014-03-06 16:00:47 +0530 |
| commit | bf2ff0468e06770f9320c652a2332f7ec137d061 (patch) | |
| tree | 2be1f13674dd20e2fd534bc0c7317df9b43bec6a /svx | |
| parent | 2ec4d410de5bd98527336a9dc49abb76656373df (diff) | |
n#821567: Use BitmapURL only if its valid.
Diffstat (limited to 'svx')
| -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()) |