diff options
| author | Muthu Subramanian <sumuthu@collabora.com> | 2014-03-12 16:29:56 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-03-17 10:41:40 +0000 |
| commit | 43dae523edd6aede5009d72be73e3627726903f9 (patch) | |
| tree | f50e97c74d3b685451f304fc70f43597e763f48d /svx | |
| parent | a54da6a84f751250c694120d1a29aaac89cd3af4 (diff) | |
n#821567: Import PPTX background images with table-name.
Ported from 2ec4d410de5bd98527336a9dc49abb76656373df
Change-Id: I19cefa3097d8a7c2da057089efb52ec8fd45b2b0
Reviewed-on: https://gerrit.libreoffice.org/8544
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
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 f8c53d795217..cbd49df5b477 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()) |