[PATCH] Change in core[libreoffice-3-6]: fdo#52989 ignore provided size of JPEG files during RTF impo...

[Miklos Vajna (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/991

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/991/1

fdo#52989 ignore provided size of JPEG files during RTF import

See commit 66fa759b for rationale, this fix just does the same for JPEG
files as well.

(cherry picked from commit ebc61e11cdb02f5cc33aeabead3d191eaf0d23d3)

Conflicts:
	sw/qa/extras/rtfimport/rtfimport.cxx

Change-Id: I6a9ead5f4b4b9c4661cae99501bd7c14a2a79409
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.hxx
2 files changed, 7 insertions(+), 3 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/991
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a9ead5f4b4b9c4661cae99501bd7c14a2a79409
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Miklos Vajna <vmiklos at suse.cz>