diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-12-16 17:02:46 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-12-18 09:55:56 +0100 |
commit | 2b225483903fa495cee1a22ede4b20eb0b6da44e (patch) | |
tree | 47913c28e562983f1217f2a7f62050d70309c7fc /sw/source/filter/html/htmlbas.cxx | |
parent | 6dbb317ebec681d236c6ce354f581108fd814f7b (diff) |
sw reqif-xhtml import: add a new AllowedRTFOLEMimeTypes parameter
The HTML import is an old-style filter, so it has no XFilter
implementation where filter() would get custom parameters out of the
box. One way would be to fix by adding one more entry to the aFormalArgs
table under sfx2/, but doing that with a random parameter of a random
import filter feels dirty.
So instead make SfxMedium store all arguments as-is, this way accessing
other keys is as easy to accessing the already available FilterOptions
(string) key.
Regarding the actual filter change, don't require "text/rtf" as a mime
type for embedded objects in the reqif XHTML import, so that in case the
file has e.g. application/rtf, then that works as well.
In case an (UNO) client wants to still limit the accepted set of MIME
types, that's possible via the new parameter.
(cherry picked from commit e0f20211a8048a87b078aa4cf0f28c0c847487ad)
Conflicts:
include/sfx2/docfile.hxx
sw/qa/extras/htmlimport/htmlimport.cxx
sw/source/filter/html/swhtml.cxx
[ Backport note: master uses std::set for m_aAllowedRTFOLEMimeTypes,
here we use std::vector, as comphelper::sequenceToContainer() can't
handle sets on this branch. And given that the elements in this
container will be small, it does not matter in practice. ]
Change-Id: Ia60da44d692f550d8ad5bbf374171cac67d9e04f
Diffstat (limited to 'sw/source/filter/html/htmlbas.cxx')
0 files changed, 0 insertions, 0 deletions