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 /include/vcl/gfxlink.hxx | |
| 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 'include/vcl/gfxlink.hxx')
| -rw-r--r-- | include/vcl/gfxlink.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index 35ae2f5ade67..84d49314c53e 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -103,12 +103,14 @@ enum GfxLinkType GFX_LINK_TYPE_NATIVE_MET = 7, // Don't forget to update the following defines GFX_LINK_TYPE_NATIVE_PCT = 8, // Don't forget to update the following defines GFX_LINK_TYPE_NATIVE_SVG = 9, // Don't forget to update the following defines - GFX_LINK_TYPE_NATIVE_MOV = 10, + GFX_LINK_TYPE_NATIVE_MOV = 10, // Don't forget to update the following defines + // #i15508# added BMP type support + GFX_LINK_TYPE_NATIVE_BMP = 11, // Don't forget to update the following defines GFX_LINK_TYPE_USER = 0xffff }; #define GFX_LINK_FIRST_NATIVE_ID GFX_LINK_TYPE_NATIVE_GIF -#define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_SVG +#define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_BMP // ----------- // - GfxLink - |