Skip to content

C
core
Kaydet (Commit) bf2ff046 authored tarafından Muthu Subramanian's avatar Muthu Subramanian
Dosyalara gözat
Seçenekler

n#821567: Use BitmapURL only if its valid.

üst 2ec4d410
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
svx/source/xoutdev/xattrbmp.cxx
Dosyayı görüntüle @ bf2ff046
...@@ -513,7 +513,9 @@ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt ...@@ -513,7 +513,9 @@ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt
} }
if( bSetURL ) 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 // #121194# Prefer GraphicObject over bitmap object if both are provided
if(bSetBitmap && GRAPHIC_NONE != maGraphicObject.GetType()) if(bSetBitmap && GRAPHIC_NONE != maGraphicObject.GetType())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment