[Libreoffice-commits] core.git: 2 commits - filter/Configuration_filter.mk

[David Tardon]

 filter/Configuration_filter.mk |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 9266664937251b802e1b48c83f5a76c6767c390f
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jun 9 12:05:23 2014 +0200

    rebuild filter config. after makefile change
    
    Change-Id: Ibc788e248ea0c63e05c55d78ec059c48cff5dd72

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index f53cf07..9256a6c 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -57,7 +57,8 @@ $(call gb_Configuration_get_target,$(1)) : $(5)
 $(call gb_Configuration_get_clean_target,$(1)) : $(6)
 $(if $(4),,$(error filter_Configuration__add_module: no input files))
 $(5) : \
-	$(addprefix $(SRCDIR)/$(3)/,$(addsuffix .xcu,$(4)))
+	$(addprefix $(SRCDIR)/$(3)/,$(addsuffix .xcu,$(4))) \
+	$(gb_Module_CURRENTMAKEFILE)
 endef
 
 # $(call filter_Configuration_add_types,configuration,typesfile,prefix,xcufiles)
commit 6e299a555dc03982f6e03434f2726ca440fcee53
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jun 9 11:53:00 2014 +0200

    rhbz#1105376 move FlatODF filter config to right place
    
    This has been broken since 3.3(!), when the old XSLT based import/export
    was replaced by a library.
    
    Change-Id: Id335f296c5a0e2c15d1748f8a14ac8d4001e1d15

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 825a899..f53cf07 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -318,6 +318,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
 	writer_MS_Word_95_Vorlage \
 	writer_MS_Word_97 \
 	writer_MS_Word_97_Vorlage \
+	writer_ODT_FlatXML \
 	writer_Rich_Text_Format \
 	writer_StarOffice_XML_Writer \
 	writer_WordPerfect_Document \
@@ -378,6 +379,7 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi
 	MS_Word_95_Vorlage \
 	MS_Word_97 \
 	MS_Word_97_Vorlage \
+	ODT_FlatXML \
 	Rich_Text_Format \
 	StarOffice_XML__Writer_ \
 	WordPerfect \
@@ -511,6 +513,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr
 # fcfg_calc
 $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/source/config/fragments/types,\
 	calc_DIF \
+	calc_ODS_FlatXML \
 	generic_HTML \
 	generic_Text \
 	calc_Lotus \
@@ -549,6 +552,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/s
 $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.xcu,filter/source/config/fragments/filters,\
 	DIF \
 	HTML__StarCalc_ \
+	ODS_FlatXML \
 	Lotus \
 	QPro \
 	MS_Excel_4_0 \
@@ -606,6 +610,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr
 
 # fcfg_draw
 $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/source/config/fragments/types,\
+	draw_ODG_FlatXML \
 	draw_StarOffice_XML_Draw \
 	draw_StarOffice_XML_Draw_Template \
 	pdf_Portable_Document_Format \
@@ -627,6 +632,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s
 )
 
 $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\
+	ODG_FlatXML \
 	StarOffice_XML__Draw_ \
 	draw_StarOffice_XML_Draw_Template \
 	draw_pdf_Export \
@@ -660,6 +666,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_impress_types.xcu,filte
 	impress_MS_PowerPoint_97 \
 	impress_MS_PowerPoint_97_AutoPlay \
 	impress_MS_PowerPoint_97_Vorlage \
+	impress_ODP_FlatXML \
 	impress_StarOffice_XML_Impress \
 	impress_StarOffice_XML_Impress_Template \
 	pdf_Portable_Document_Format \
@@ -681,6 +688,7 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impress_filters.xcu,f
 	MS_PowerPoint_97_AutoPlay \
 	MS_PowerPoint_97_Vorlage \
 	impress_StarOffice_XML_Draw \
+	ODP_FlatXML \
 	StarOffice_XML__Impress_ \
 	impress_StarOffice_XML_Impress_Template \
 	impress_pdf_Export \
@@ -984,11 +992,7 @@ $(call filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_internalgrap
 
 # fcfg_xslt
 $(call filter_Configuration_add_types,fcfg_langpack,fcfg_xslt_types.xcu,filter/source/config/fragments/types,\
-	calc_ODS_FlatXML \
-	draw_ODG_FlatXML \
-	impress_ODP_FlatXML \
 	writer_DocBook_File \
-	writer_ODT_FlatXML \
 	XHTML_File \
 	Unified_Office_Format_text \
 	Unified_Office_Format_spreadsheet \
@@ -997,10 +1001,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_xslt_types.xcu,filter/s
 
 $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_xslt_filters.xcu,filter/source/config/fragments/filters,\
 	DocBook_File \
-	ODG_FlatXML \
-	ODP_FlatXML \
-	ODS_FlatXML \
-	ODT_FlatXML \
 	XHTML_Calc_File \
 	XHTML_Draw_File \
 	XHTML_Impress_File \