diff options
| author | Armin Le Grand <alg@apache.org> | 2012-10-16 08:44:02 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2012-10-16 08:44:02 +0000 |
| commit | 7a652a2b2ab5e0d37e32185c8c5fac3af482bb76 (patch) | |
| tree | 3cf859e86a5d4ba2a39e75d1f5bc65a5d8bc10b2 /svx/source/xoutdev | |
| parent | 9d483a7b084404ed9df6525f09a3bb600a5859f8 (diff) | |
#121194# Better support for graphic fill styles which are not bitmaps (svg, metafiles, ..)
Notes
Notes:
merged as: 37aa7d81aacaae12dfe0fd2ade2779235bbf72f1
Diffstat (limited to 'svx/source/xoutdev')
| -rw-r--r-- | svx/source/xoutdev/xattrbmp.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 52e81ed731a0..266492712cd8 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -414,6 +414,12 @@ sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_ if( bSetURL ) { maGraphicObject = GraphicObject::CreateGraphicObjectFromURL(aURL); + + // #121194# Prefer GraphicObject over bitmap object if both are provided + if(bSetBitmap && GRAPHIC_NONE != maGraphicObject.GetType()) + { + bSetBitmap = false; + } } if( bSetBitmap ) { |