diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-05-03 09:35:58 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-05 14:34:33 +0000 |
| commit | c521fcae80f5a7a5d56105e316b2e3d9130001d9 (patch) | |
| tree | b1597d6ba14338ab3105d494528f70236c8a1470 /writerfilter/source/rtftok/rtfdocumentimpl.hxx | |
| parent | 7c4fe800c2b4f5150ff7193a45710304bcdf25f0 (diff) | |
tdf#95707 RTF import: handle device-independent bitmaps
See
<https://msdn.microsoft.com/en-us/library/dd183374%28v=vs.85%29.aspx>
for more info about the header structure that has to be prepended to the
real data to make our BMP import filter happy.
Also: disable a unit test on OS X, that previously passed, but turns out
to be unstable on libreoffice-5-1.
(cherry picked from commit 6bacfc8d95163a3eacc2784660282a8ce7d9a552)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: Iabdf4cd169b82ea951d1c1b12432d97d61b7af51
Reviewed-on: https://gerrit.libreoffice.org/24656
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter/source/rtftok/rtfdocumentimpl.hxx')
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 7f89736f6621..e089f01436f8 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -73,7 +73,8 @@ enum class RTFBmpStyle { NONE, PNG, - JPEG + JPEG, + DIBITMAP }; enum class RTFFieldStatus |