svx/source/xoutdev/xattrbmp.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 910716696fa7bd0b87381121b10668dcb7953661 Author: Muthu Subramanian <[email protected]> Date: Wed Mar 12 16:46:50 2014 +0530 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 <[email protected]> Tested-by: Norbert Thiebaud <[email protected]> diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index d2a5566..a24fce6 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 ) { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
