diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-04-15 14:59:15 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-04-23 12:00:28 +0200 |
commit | ff93e4977cb1e23f355d248a77e8d0e56bb0f4b9 (patch) | |
tree | 549a091f0aaf8acd6b61f38b0df0a604421a1ae9 /include | |
parent | 5b7561e758d3552d41bd65149f1fcbb6650e0887 (diff) |
tdf#131936 Correctly detect OOXML variant on import
Change-Id: I29a6b0454bf741ce8ad49078597b3412a83dedb9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92278
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/oox/core/filterdetect.hxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index 47de23055c60..9b34de75b09c 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -49,6 +49,12 @@ namespace oox { class AttributeList; } namespace oox { namespace core { +enum class OOXMLVariant { + ECMA_Transitional, + ISO_Transitional, + ISO_Strict +}; + /** Document handler specifically designed for detecting OOXML file formats. @@ -79,7 +85,7 @@ public: private: void parseRelationship( const AttributeList& rAttribs ); - static OUString getFilterNameFromContentType( const OUString& rContentType, const OUString& rFileName ); + OUString getFilterNameFromContentType( const OUString& rContentType, const OUString& rFileName ); void parseContentTypesDefault( const AttributeList& rAttribs ); void parseContentTypesOverride( const AttributeList& rAttribs ); @@ -90,6 +96,7 @@ private: OUString maFileName; ContextVector maContextStack; OUString maTargetPath; + OOXMLVariant maOOXMLVariant; css::uno::Reference< css::uno::XComponentContext > mxContext; }; |