summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@collabora.com>2014-03-12 16:46:50 +0530
committerNorbert Thiebaud <nthiebaud@gmail.com>2014-03-12 13:07:17 -0500
commit910716696fa7bd0b87381121b10668dcb7953661 (patch)
treeda6d2b020d88f2990f3c8cfe28e5a357d7564a62 /svx
parent2166db00d1d639b3a5032f1866a6c5cd7275e57d (diff)
n#821567: Use BitmapURL only if its valid.
Ported from: bf2ff0468e06770f9320c652a2332f7ec137d061 Change-Id: I7464fcba352798a686fc0563dd023feac5234dbf Reviewed-on: https://gerrit.libreoffice.org/8547 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index d2a556676611..a24fce63c125 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -605,7 +605,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;
}
if( bSetBitmap )
{