|
 |
6292628 |
From 6e299a555dc03982f6e03434f2726ca440fcee53 Mon Sep 17 00:00:00 2001
|
|
|
6292628 |
From: David Tardon <dtardon@redhat.com>
|
|
|
6292628 |
Date: Mon, 9 Jun 2014 11:53:00 +0200
|
|
|
6292628 |
Subject: [PATCH] rhbz#1105376 move FlatODF filter config to right place
|
|
|
6292628 |
|
|
|
6292628 |
This has been broken since 3.3(!), when the old XSLT based import/export
|
|
|
6292628 |
was replaced by a library.
|
|
|
6292628 |
|
|
|
6292628 |
Change-Id: Id335f296c5a0e2c15d1748f8a14ac8d4001e1d15
|
|
|
6292628 |
---
|
|
|
6292628 |
filter/Configuration_filter.mk | 16 ++++++++--------
|
|
|
6292628 |
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
6292628 |
|
|
|
6292628 |
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
|
|
|
6292628 |
index 825a899..f53cf07 100644
|
|
|
6292628 |
--- a/filter/Configuration_filter.mk
|
|
|
6292628 |
+++ b/filter/Configuration_filter.mk
|
|
|
6292628 |
@@ -318,6 +318,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
|
|
|
6292628 |
writer_MS_Word_95_Vorlage \
|
|
|
6292628 |
writer_MS_Word_97 \
|
|
|
6292628 |
writer_MS_Word_97_Vorlage \
|
|
|
6292628 |
+ writer_ODT_FlatXML \
|
|
|
6292628 |
writer_Rich_Text_Format \
|
|
|
6292628 |
writer_StarOffice_XML_Writer \
|
|
|
6292628 |
writer_WordPerfect_Document \
|
|
|
6292628 |
@@ -378,6 +379,7 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi
|
|
|
6292628 |
MS_Word_95_Vorlage \
|
|
|
6292628 |
MS_Word_97 \
|
|
|
6292628 |
MS_Word_97_Vorlage \
|
|
|
6292628 |
+ ODT_FlatXML \
|
|
|
6292628 |
Rich_Text_Format \
|
|
|
6292628 |
StarOffice_XML__Writer_ \
|
|
|
6292628 |
WordPerfect \
|
|
|
6292628 |
@@ -511,6 +513,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr
|
|
|
6292628 |
# fcfg_calc
|
|
|
6292628 |
$(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/source/config/fragments/types,\
|
|
|
6292628 |
calc_DIF \
|
|
|
6292628 |
+ calc_ODS_FlatXML \
|
|
|
6292628 |
generic_HTML \
|
|
|
6292628 |
generic_Text \
|
|
|
6292628 |
calc_Lotus \
|
|
|
6292628 |
@@ -549,6 +552,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/s
|
|
|
6292628 |
$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.xcu,filter/source/config/fragments/filters,\
|
|
|
6292628 |
DIF \
|
|
|
6292628 |
HTML__StarCalc_ \
|
|
|
6292628 |
+ ODS_FlatXML \
|
|
|
6292628 |
Lotus \
|
|
|
6292628 |
QPro \
|
|
|
6292628 |
MS_Excel_4_0 \
|
|
|
6292628 |
@@ -606,6 +610,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr
|
|
|
6292628 |
|
|
|
6292628 |
# fcfg_draw
|
|
|
6292628 |
$(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/source/config/fragments/types,\
|
|
|
6292628 |
+ draw_ODG_FlatXML \
|
|
|
6292628 |
draw_StarOffice_XML_Draw \
|
|
|
6292628 |
draw_StarOffice_XML_Draw_Template \
|
|
|
6292628 |
pdf_Portable_Document_Format \
|
|
|
6292628 |
@@ -627,6 +632,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s
|
|
|
6292628 |
)
|
|
|
6292628 |
|
|
|
6292628 |
$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\
|
|
|
6292628 |
+ ODG_FlatXML \
|
|
|
6292628 |
StarOffice_XML__Draw_ \
|
|
|
6292628 |
draw_StarOffice_XML_Draw_Template \
|
|
|
6292628 |
draw_pdf_Export \
|
|
|
6292628 |
@@ -660,6 +666,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_impress_types.xcu,filte
|
|
|
6292628 |
impress_MS_PowerPoint_97 \
|
|
|
6292628 |
impress_MS_PowerPoint_97_AutoPlay \
|
|
|
6292628 |
impress_MS_PowerPoint_97_Vorlage \
|
|
|
6292628 |
+ impress_ODP_FlatXML \
|
|
|
6292628 |
impress_StarOffice_XML_Impress \
|
|
|
6292628 |
impress_StarOffice_XML_Impress_Template \
|
|
|
6292628 |
pdf_Portable_Document_Format \
|
|
|
6292628 |
@@ -681,6 +688,7 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impress_filters.xcu,f
|
|
|
6292628 |
MS_PowerPoint_97_AutoPlay \
|
|
|
6292628 |
MS_PowerPoint_97_Vorlage \
|
|
|
6292628 |
impress_StarOffice_XML_Draw \
|
|
|
6292628 |
+ ODP_FlatXML \
|
|
|
6292628 |
StarOffice_XML__Impress_ \
|
|
|
6292628 |
impress_StarOffice_XML_Impress_Template \
|
|
|
6292628 |
impress_pdf_Export \
|
|
|
6292628 |
@@ -984,11 +992,7 @@ $(call filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_internalgrap
|
|
|
6292628 |
|
|
|
6292628 |
# fcfg_xslt
|
|
|
6292628 |
$(call filter_Configuration_add_types,fcfg_langpack,fcfg_xslt_types.xcu,filter/source/config/fragments/types,\
|
|
|
6292628 |
- calc_ODS_FlatXML \
|
|
|
6292628 |
- draw_ODG_FlatXML \
|
|
|
6292628 |
- impress_ODP_FlatXML \
|
|
|
6292628 |
writer_DocBook_File \
|
|
|
6292628 |
- writer_ODT_FlatXML \
|
|
|
6292628 |
XHTML_File \
|
|
|
6292628 |
Unified_Office_Format_text \
|
|
|
6292628 |
Unified_Office_Format_spreadsheet \
|
|
|
6292628 |
@@ -997,10 +1001,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_xslt_types.xcu,filter/s
|
|
|
6292628 |
|
|
|
6292628 |
$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_xslt_filters.xcu,filter/source/config/fragments/filters,\
|
|
|
6292628 |
DocBook_File \
|
|
|
6292628 |
- ODG_FlatXML \
|
|
|
6292628 |
- ODP_FlatXML \
|
|
|
6292628 |
- ODS_FlatXML \
|
|
|
6292628 |
- ODT_FlatXML \
|
|
|
6292628 |
XHTML_Calc_File \
|
|
|
6292628 |
XHTML_Draw_File \
|
|
|
6292628 |
XHTML_Impress_File \
|
|
|
6292628 |
--
|
|
|
6292628 |
1.9.3
|
|
|
6292628 |
|