diff options
| author | Armin Le Grand <alg@apache.org> | 2014-02-27 13:46:24 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 19:30:40 +0000 |
| commit | af63727b9fdd48258f692d1ccf6d15daccc18681 (patch) | |
| tree | b23adba5c31315383e05ee9bc2310a93fa1e575f /oox | |
| parent | normalize values of ICU_RECLASSIFIED_* (diff) | |
| download | core-af63727b9fdd48258f692d1ccf6d15daccc18681.tar.gz core-af63727b9fdd48258f692d1ccf6d15daccc18681.zip | |
Resolves: #i15508# Added support for BMP file type
(cherry picked from commit 9956ed1303545cd61901e33b110698c4e5e224c4)
Conflicts:
filter/source/msfilter/escherex.cxx
include/vcl/gfxlink.hxx
svx/source/xml/xmlgrhlp.cxx
sw/source/ui/docvw/romenu.cxx
vcl/source/filter/graphicfilter.cxx
Change-Id: Ibcbb69b9c57cd8a438788e9a9c95744e99b6fcdd
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index cd67e57b0c56..cf25f2a47661 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -730,6 +730,14 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic , bool bRelPathToMedia ) sMediaType = "image/gif"; pExtension = ".gif"; break; + + // #i15508# added BMP type for better exports + // export not yet active, so adding for reference (not checked) + case GFX_LINK_TYPE_NATIVE_BMP: + sMediaType = "image/bmp"; + pExtension = ".bmp"; + break; + case GFX_LINK_TYPE_NATIVE_JPG: sMediaType = "image/jpeg"; pExtension = ".jpeg"; |