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-16 21:52:52 +0200 |
| commit | 38e00e1dc967ebc7d94c5360ad57a3ae98d1cddb (patch) | |
| tree | 80bfd1b3dff6ce75c5869987d542fc105ac87b78 /sfx2/source/doc/docfile.cxx | |
| parent | b13a612d22e10e38fd78776e7365ec30f0c84361 (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/+/96477
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Diffstat (limited to 'sfx2/source/doc/docfile.cxx')
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 5d00d39bd837..b1ef5fa0e5f2 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -306,7 +306,6 @@ public: uno::Sequence < util::RevisionTag > aVersions; std::unique_ptr<::utl::TempFile> pTempFile; - uno::Reference<embed::XStorage> xStorage; uno::Reference<embed::XStorage> m_xZipStorage; uno::Reference<io::XInputStream> m_xInputStreamToLoadFrom; @@ -328,6 +327,8 @@ public: util::DateTime m_aDateTime; + uno::Sequence<beans::PropertyValue> m_aArgs; + explicit SfxMedium_Impl(); ~SfxMedium_Impl(); SfxMedium_Impl(const SfxMedium_Impl&) = delete; @@ -3301,6 +3302,12 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) : Init_Impl(); } +void SfxMedium::SetArgs(const uno::Sequence<beans::PropertyValue>& rArgs) +{ + pImpl->m_aArgs = rArgs; +} + +uno::Sequence<beans::PropertyValue> SfxMedium::GetArgs() const { return pImpl->m_aArgs; } SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const std::shared_ptr<SfxItemSet>& p ) : pImpl(new SfxMedium_Impl) |