summaryrefslogtreecommitdiff
path: root/include/xmloff/xmlexppr.hxx
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2021-05-10 16:41:54 +0200
committerMichael Stahl <michael.stahl@allotropia.de>2021-05-10 21:07:40 +0200
commit16de54a5c47fbc4691ee099c1f7bb559a8fe11ac (patch)
tree25001b1ee47ba73a12f156e436dfa3d6e7d52e74 /include/xmloff/xmlexppr.hxx
parentd9a6e0c8b74522fca7ff008a13184e479efd1ba0 (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 'include/xmloff/xmlexppr.hxx')
-rw-r--r--include/xmloff/xmlexppr.hxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index f2f1e6adf72e..5e47201a5234 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -64,6 +64,7 @@ protected:
After this process It'll called 'Contextfilter' for application-specific
filter-processes. */
std::vector<XMLPropertyState> Filter_(
+ SvXMLExport const& rExport,
const css::uno::Reference<css::beans::XPropertySet>& rPropSet,
bool bDefault, bool bDisableFoFontFamily ) const;
@@ -114,6 +115,7 @@ public:
After this process It'll called 'Contextfilter' for application-specific
filter-processes. */
std::vector<XMLPropertyState> Filter(
+ SvXMLExport const& rExport,
const css::uno::Reference<css::beans::XPropertySet>& rPropSet, bool bEnableFoFontFamily = false ) const;
/** Like Filter(), except that:
@@ -122,6 +124,7 @@ public:
* - instead of the property's value, its default value is exported.
*/
std::vector<XMLPropertyState> FilterDefaults(
+ SvXMLExport const& rExport,
const css::uno::Reference<css::beans::XPropertySet>& rPropSet ) const;
/** Provides a partial ordering over two arrays of XMLPropertyState,