diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-05-10 16:41:54 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-05-10 21:07:40 +0200 |
| commit | 16de54a5c47fbc4691ee099c1f7bb559a8fe11ac (patch) | |
| tree | 25001b1ee47ba73a12f156e436dfa3d6e7d52e74 /dbaccess | |
| parent | d9a6e0c8b74522fca7ff008a13184e479efd1ba0 (diff) | |
tdf#138209 ODF export: work around forms problem in LO < 7.0
LO without commit 519d96fd8b83ef4c61576d87b58f97b7e6e6e3c6 makes a mess
when storing form documents it has loaded from ODF 1.3 documents: the
XML parts are stored as ODF 1.2, but the storage (and therefore manifest
entry) keeps version 1.3.
To avoid this, store form documents as ODF 1.2 extended by default.
Unfortunately a bunch of ODF export code accesses the global
SvtSaveOptions variable; with this version override, only
SvXMLExport::getSaneDefaultVersion() must be used.
Change-Id: I5fa8e286f5103c578ed0d93da07a8a6cbe2f0ddd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115357
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/filter/xml/xmlExport.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 58aa2b4decf7..1e4f79d4ce44 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -1074,7 +1074,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) std::vector< XMLPropertyState > aPropertyStates; for (const auto & i : pExportHelper) { - aPropertyStates = i.first->Filter(_xProp); + aPropertyStates = i.first->Filter(*this, _xProp); if ( !aPropertyStates.empty() ) i.second.first->emplace( _xProp,GetAutoStylePool()->Add( i.second.second, aPropertyStates ) ); } @@ -1088,7 +1088,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) GetFontAutoStylePool()->Add(aFont.Name,aFont.StyleName,static_cast<FontFamily>(aFont.Family), static_cast<FontPitch>(aFont.Pitch),aFont.CharSet ); - m_aCurrentPropertyStates = m_xCellExportHelper->Filter(_xProp); + m_aCurrentPropertyStates = m_xCellExportHelper->Filter(*this, _xProp); if ( !m_aCurrentPropertyStates.empty() && !xCollection->hasElements() ) { Reference< XDataDescriptorFactory> xFac(xCollection,UNO_QUERY); @@ -1119,7 +1119,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) }; for (const auto & i : pExportHelper) { - std::vector< XMLPropertyState > aPropStates = i.first->Filter( _xProp ); + std::vector< XMLPropertyState > aPropStates = i.first->Filter(*this, _xProp); if ( !aPropStates.empty() ) { const rtl::Reference < XMLPropertySetMapper >& pStyle = i.first->getPropertySetMapper(); |