diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-12-17 17:54:21 +0100 |
|---|---|---|
| committer | Gülşah Köse <gulsah.kose@collabora.com> | 2020-06-17 10:53:20 +0200 |
| commit | 4001186a00cf0cf7f17048818ccbc6fd10a2fcf6 (patch) | |
| tree | 891d41b2bb9de07fe24b7b960015affdf1cc3b5f /include | |
| parent | a8a7975db21578c3f6e3ace96323df867a1c6161 (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().
Change-Id: I71d2c7920f42d98133f345703cfdfd50f0e8550c
Reviewed-on: https://gerrit.libreoffice.org/85321
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96481
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/docfile.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/objsh.hxx | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index 482c1e4ba3ce..bfed0361c1f6 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -123,6 +123,9 @@ public: const std::shared_ptr<const SfxFilter>& GetFilter() const; const OUString& GetOrigURL() const; + void SetArgs(const css::uno::Sequence<css::beans::PropertyValue>& rArgs); + css::uno::Sequence<css::beans::PropertyValue> GetArgs() const; + SfxItemSet * GetItemSet() const; void Close(); void CloseAndRelease(); diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index c6e9b017a967..4b1e73fd759b 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -737,9 +737,15 @@ public: SAL_DLLPRIVATE void SetNamedVisibility_Impl(); SAL_DLLPRIVATE bool DoSave_Impl( const SfxItemSet* pSet ); SAL_DLLPRIVATE bool Save_Impl( const SfxItemSet* pSet ); - SAL_DLLPRIVATE bool PreDoSaveAs_Impl(const OUString& rFileName, const OUString& rFiltName, SfxItemSet const & rItemSet); - SAL_DLLPRIVATE bool APISaveAs_Impl(const OUString& aFileName, SfxItemSet& rItemSet); - SAL_DLLPRIVATE bool CommonSaveAs_Impl(const INetURLObject& aURL, const OUString& aFilterName, SfxItemSet& rItemSet); + SAL_DLLPRIVATE bool + PreDoSaveAs_Impl(const OUString& rFileName, const OUString& rFiltName, + SfxItemSet const& rItemSet, + const css::uno::Sequence<css::beans::PropertyValue>& rArgs); + SAL_DLLPRIVATE bool APISaveAs_Impl(const OUString& aFileName, SfxItemSet& rItemSet, + const css::uno::Sequence<css::beans::PropertyValue>& rArgs); + SAL_DLLPRIVATE bool + CommonSaveAs_Impl(const INetURLObject& aURL, const OUString& aFilterName, SfxItemSet& rItemSet, + const css::uno::Sequence<css::beans::PropertyValue>& rArgs); SAL_DLLPRIVATE bool GeneralInit_Impl( const css::uno::Reference< css::embed::XStorage >& xStorage, bool bTypeMustBeSetAlready ); |