summaryrefslogtreecommitdiff
path: root/sw/source/filter/html/htmlforw.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-12-17 17:54:21 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-12-18 10:31:10 +0100
commit4b113550df32f1aca3f3dd07dc23e338b8bbefec (patch)
tree1eb0b8c34cc2ebb563f8f5183d0a6989422dbfe3 /sw/source/filter/html/htmlforw.cxx
parent2b225483903fa495cee1a22ede4b20eb0b6da44e (diff)
sw reqif-xhtml export: add a new RTFOLEMimeType parameter
This is similar to commit e0f20211a8048a87b078aa4cf0f28c0c847487ad (sw reqif-xhtml import: add a new AllowedRTFOLEMimeTypes parameter, 2019-12-16), except that was for the import and this is for the import. The situation was similar, SfxBaseModel::impl_store() still had the custom store parameters, but later functions lost it, so at the end OutHTML_FrameFormatOLENodeGrf() in the sw HTML export could not respect it. Fix the problem in a similar way, so the SfxMedium instance created for the duration of the export provides the custom options via SfxMedium::GetArgs(). (cherry picked from commit 037cd13af81f8a1169d01e95036ed942f261f9a6) Conflicts: include/sfx2/objsh.hxx sfx2/source/doc/objstor.cxx sfx2/source/doc/sfxbasemodel.cxx sw/source/filter/html/wrthtml.cxx sw/source/filter/html/wrthtml.hxx Change-Id: I71d2c7920f42d98133f345703cfdfd50f0e8550c
Diffstat (limited to 'sw/source/filter/html/htmlforw.cxx')
0 files changed, 0 insertions, 0 deletions