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 13:01:32 +0200 |
| commit | 697173f6fdfae581022cfdb5ec5171c5a3be58f0 (patch) | |
| tree | 62f5908241dcbf7cdb65aa5227d1b356030974a5 /filter | |
| parent | 88ff39aee58cf0c098a2cce311cf62efbd76bb6d (diff) | |
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.
Change-Id: I08fa734c72fab7400bd327a07a760839556dbf6f
Reviewed-on: https://gerrit.libreoffice.org/38298
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'filter')
4 files changed, 38 insertions, 1 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 7f3843cd47fe..0ed0d6170419 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -342,6 +342,7 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu writer8 \ writer_MS_Word_2007_XML \ writer_MS_Word_2007_XML_Template \ + writer_MS_Word_2007_XML_VBA \ writer_OOXML \ writer_OOXML_Template \ writer_layout_dump_xml \ @@ -388,6 +389,7 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters writer8_template \ MS_Word_2007_XML \ MS_Word_2007_XML_Template \ + MS_Word_2007_XML_VBA \ OOXML_Text \ OOXML_Text_Template \ writer_layout_dump \ diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_VBA.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_VBA.xcu new file mode 100644 index 000000000000..6f4774d42b83 --- /dev/null +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML_VBA.xcu @@ -0,0 +1,18 @@ +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. +--> + <node oor:name="MS Word 2007 XML VBA" oor:op="replace"> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER ENCRYPTION PASSWORDTOMODIFY SUPPORTSSIGNING</value></prop> + <prop oor:name="UIComponent"/> + <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop> + <prop oor:name="UserData"><value>OXML</value></prop> + <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Word 2007-2013 XML VBA</value></prop> + <prop oor:name="FileFormatVersion"><value>0</value></prop> + <prop oor:name="Type"><value>writer_MS_Word_2007_VBA</value></prop> + <prop oor:name="TemplateName"/> + <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop> + </node> diff --git a/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu b/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu index 9e21ef50de5a..d6c62ddf439d 100644 --- a/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu +++ b/filter/source/config/fragments/types/writer_MS_Word_2007_XML.xcu @@ -18,7 +18,7 @@ <node oor:name="writer_MS_Word_2007" oor:op="replace" > <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop> <prop oor:name="URLPattern"/> - <prop oor:name="Extensions"><value>docx docm</value></prop> + <prop oor:name="Extensions"><value>docx</value></prop> <prop oor:name="MediaType"><value>application/msword</value></prop> <prop oor:name="Preferred"><value>true</value></prop> <prop oor:name="PreferredFilter"><value>MS Word 2007 XML</value></prop> diff --git a/filter/source/config/fragments/types/writer_MS_Word_2007_XML_VBA.xcu b/filter/source/config/fragments/types/writer_MS_Word_2007_XML_VBA.xcu new file mode 100644 index 000000000000..5ee986fc8d83 --- /dev/null +++ b/filter/source/config/fragments/types/writer_MS_Word_2007_XML_VBA.xcu @@ -0,0 +1,17 @@ +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. +--> + <node oor:name="writer_MS_Word_2007_VBA" oor:op="replace" > + <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop> + <prop oor:name="URLPattern"/> + <prop oor:name="Extensions"><value>docm</value></prop> + <prop oor:name="MediaType"><value>application/msword</value></prop> + <prop oor:name="Preferred"><value>true</value></prop> + <prop oor:name="PreferredFilter"><value>MS Word 2007 XML VBA</value></prop> + <prop oor:name="UIName"><value xml:lang="en-US">Microsoft Word 2007-2013 XML VBA</value></prop> + <prop oor:name="ClipboardFormat"><value>MSWordDoc</value></prop> + </node> |