summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2014-02-27 13:46:24 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-27 19:30:40 +0000
commitaf63727b9fdd48258f692d1ccf6d15daccc18681 (patch)
treeb23adba5c31315383e05ee9bc2310a93fa1e575f /svtools
parentc3bdaca0e6c26775fae7f682732251a8e72cff30 (diff)
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 'svtools')
-rw-r--r--svtools/source/graphic/descriptor.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 88447028a2d4..f235e21d8519 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -360,6 +360,10 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
switch( const_cast< Graphic* >( mpGraphic )->GetLink().GetType() )
{
case( GFX_LINK_TYPE_NATIVE_GIF ): pMimeType = MIMETYPE_GIF; break;
+
+ // #i15508# added BMP type for better exports (checked, works)
+ case( GFX_LINK_TYPE_NATIVE_BMP ): pMimeType = MIMETYPE_BMP; break;
+
case( GFX_LINK_TYPE_NATIVE_JPG ): pMimeType = MIMETYPE_JPG; break;
case( GFX_LINK_TYPE_NATIVE_PNG ): pMimeType = MIMETYPE_PNG; break;
case( GFX_LINK_TYPE_NATIVE_WMF ): pMimeType = MIMETYPE_WMF; break;