diff options
| author | Muthu Subramanian <sumuthu@collabora.com> | 2014-03-12 16:29:56 +0530 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-03-25 11:40:09 +0200 |
| commit | decfc0306461aded04284023c05684f47ae6baad (patch) | |
| tree | 65f64d1332d569b1ce925f1a36522b85850995be /svx | |
| parent | 06f23561ad7d635b868b7afe70b195aacb8d05de (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()) |