diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-01 09:46:16 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-01 15:41:50 +0200 |
| commit | 0e6ecd59ec0767fc74cec37512bacaabc3cd1f9d (patch) | |
| tree | 55693e3a67ad7f7f37631ee3d54863e982696409 /oox | |
| parent | 0b0cc6a3306a03798fdbe766976480160d0d5c22 (diff) | |
tdf#108269 sw: add separate DOCM filter
This way at export time we can preserve the correct content-type, which
isn't the same for DOCX and DOCM.
(cherry picked from commit 697173f6fdfae581022cfdb5ec5171c5a3be58f0)
Change-Id: I08fa734c72fab7400bd327a07a760839556dbf6f
Reviewed-on: https://gerrit.libreoffice.org/38308
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/core/filterdetect.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index d397ae3a4b9b..1882572f12d5 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -162,10 +162,12 @@ void FilterDetectDocHandler::parseRelationship( const AttributeList& rAttribs ) OUString FilterDetectDocHandler::getFilterNameFromContentType( const OUString& rContentType ) { - if( rContentType == "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml" || - rContentType == "application/vnd.ms-word.document.macroEnabled.main+xml" ) + if( rContentType == "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml" ) return OUString( "writer_MS_Word_2007" ); + if( rContentType == "application/vnd.ms-word.document.macroEnabled.main+xml" ) + return OUString( "writer_MS_Word_2007_VBA" ); + if( rContentType == "application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml" || rContentType == "application/vnd.ms-word.template.macroEnabledTemplate.main+xml" ) return OUString( "writer_MS_Word_2007_Template" ); |