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 /vcl/source/gdi/gfxlink.cxx | |
| parent | c3bdaca0e6c26775fae7f682732251a8e72cff30 (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 'vcl/source/gdi/gfxlink.cxx')
| -rw-r--r-- | vcl/source/gdi/gfxlink.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 742b5537e109..1d726bae9dd5 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -203,6 +203,10 @@ bool GfxLink::LoadNative( Graphic& rGraphic ) switch( meType ) { case( GFX_LINK_TYPE_NATIVE_GIF ): nCvtType = CVT_GIF; break; + + // #i15508# added BMP type for better exports (reload when swapped - checked, works) + case( GFX_LINK_TYPE_NATIVE_BMP ): nCvtType = CVT_BMP; break; + case( GFX_LINK_TYPE_NATIVE_JPG ): nCvtType = CVT_JPG; break; case( GFX_LINK_TYPE_NATIVE_PNG ): nCvtType = CVT_PNG; break; case( GFX_LINK_TYPE_NATIVE_TIF ): nCvtType = CVT_TIF; break; |