mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move UOF and Office 2003 filters to xsltfilter module

Browse Source 
Change-Id: I6e5ac310567bb7bd12fbba444e4e1deb9fea30d5
This commit is contained in:
David Tardon
2014-06-09 13:51:36 +02:00
parent c506639c93
commit be4b837ed2
6 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
filter/Configuration_filter.mk
View File

@@ -357,7 +357,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
pdf_Portable_Document_Format \ pdf_Portable_Document_Format \
writer8_template \ writer8_template \
writer8 \ writer8 \
writer_MS_Word_2003_XML \
writer_MS_Word_2007_XML \ writer_MS_Word_2007_XML \
writer_MS_Word_2007_XML_Template \ writer_MS_Word_2007_XML_Template \
writer_OOXML \ writer_OOXML \
@@ -419,7 +418,6 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi
writer_pdf_Export\ writer_pdf_Export\
writer8\ writer8\
writer8_template \ writer8_template \
MS_Word_2003_XML \
MS_Word_2007_XML \ MS_Word_2007_XML \
MS_Word_2007_XML_Template \ MS_Word_2007_XML_Template \
OOXML_Text \ OOXML_Text \
@@ -444,7 +442,6 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr
writer_StarOffice_XML_Writer_Template_ui \ writer_StarOffice_XML_Writer_Template_ui \
writer8_ui \ writer8_ui \
writer8_template_ui \ writer8_template_ui \
MS_Word_2003_XML_ui \
MS_Word_2007_XML_ui \ MS_Word_2007_XML_ui \
MS_Word_2007_XML_Template_ui \ MS_Word_2007_XML_Template_ui \
OOXML_Text_ui \ OOXML_Text_ui \
@@ -535,7 +532,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/s
calc_dBase\ calc_dBase\
calc8 \ calc8 \
calc8_template \ calc8_template \
calc_MS_Excel_2003_XML \
MS_Excel_2007_XML \ MS_Excel_2007_XML \
MS_Excel_2007_XML_Template \ MS_Excel_2007_XML_Template \
MS_Excel_2007_Binary \ MS_Excel_2007_Binary \
@@ -574,7 +570,6 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.xcu,filt
dBase \ dBase \
calc8 \ calc8 \
calc8_template \ calc8_template \
MS_Excel_2003_XML \
calc_MS_Excel_2007_XML \ calc_MS_Excel_2007_XML \
calc_MS_Excel_2007_XML_Template \ calc_MS_Excel_2007_XML_Template \
calc_MS_Excel_2007_Binary \ calc_MS_Excel_2007_Binary \
@@ -601,7 +596,6 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr
calc_StarOffice_XML_Calc_Template_ui \ calc_StarOffice_XML_Calc_Template_ui \
calc8_ui \ calc8_ui \
calc8_template_ui \ calc8_template_ui \
MS_Excel_2003_XML_ui \
calc_MS_Excel_2007_XML_ui \ calc_MS_Excel_2007_XML_ui \
calc_MS_Excel_2007_XML_Template_ui \ calc_MS_Excel_2007_XML_Template_ui \
calc_MS_Excel_2007_Binary_ui \ calc_MS_Excel_2007_Binary_ui \
@@ -993,7 +987,9 @@ $(call filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_internalgrap
# fcfg_xslt # fcfg_xslt
$(call filter_Configuration_add_types,fcfg_langpack,fcfg_xslt_types.xcu,filter/source/config/fragments/types,\ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_xslt_types.xcu,filter/source/config/fragments/types,\
calc_MS_Excel_2003_XML \
writer_DocBook_File \ writer_DocBook_File \
writer_MS_Word_2003_XML \
XHTML_File \ XHTML_File \
Unified_Office_Format_text \ Unified_Office_Format_text \
Unified_Office_Format_spreadsheet \ Unified_Office_Format_spreadsheet \
@@ -1002,6 +998,8 @@ $(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,\ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_xslt_filters.xcu,filter/source/config/fragments/filters,\
DocBook_File \ DocBook_File \
MS_Excel_2003_XML \
MS_Word_2003_XML \
XHTML_Calc_File \ XHTML_Calc_File \
XHTML_Draw_File \ XHTML_Draw_File \
XHTML_Impress_File \ XHTML_Impress_File \
@@ -1011,4 +1009,9 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_xslt_filters.xcu,filt
UOF_presentation \ UOF_presentation \
) )
$(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
MS_Excel_2003_XML_ui \
MS_Word_2003_XML_ui \
)
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

1
postprocess/CustomTarget_registry.mk
View File

@@ -427,6 +427,7 @@ postprocess_FILES_writer := \
$(postprocess_MOD)/org/openoffice/Setup-writer.xcu $(postprocess_MOD)/org/openoffice/Setup-writer.xcu
postprocess_DEPS_xsltfilter := main postprocess_DEPS_xsltfilter := main
postprocess_OPTDEPS_xsltfilter := calc writer
postprocess_FILES_xsltfilter := \ postprocess_FILES_xsltfilter := \
$(call gb_XcuFilterFiltersTarget_get_target,fcfg_xslt_filters.xcu) \ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_xslt_filters.xcu) \
$(call gb_XcuFilterTypesTarget_get_target,fcfg_xslt_types.xcu) $(call gb_XcuFilterTypesTarget_get_target,fcfg_xslt_types.xcu)

7
scp2/source/ooo/file_ooo.scp
View File

@@ -598,13 +598,6 @@ End
#endif #endif
File gid_File_filter_xslt
TXT_FILE_BODY;
Styles = (FILELIST, PACKED);
Dir = FILELIST_DIR;
Name = "filter_xslt.filelist";
End
File gid_Starregistry_Services_Rdb File gid_Starregistry_Services_Rdb
TXT_FILE_BODY; TXT_FILE_BODY;
Name = "services.rdb"; Name = "services.rdb";

1
scp2/source/ooo/module_hidden_ooo.scp
View File

@@ -274,7 +274,6 @@ Module gid_Module_Root_Files_6
gid_File_Share_Registry_Main_Xcd, gid_File_Share_Registry_Main_Xcd,
gid_File_Share_Registry_Forcedefault_Xcd, gid_File_Share_Registry_Forcedefault_Xcd,
gid_File_Pymailmerge, gid_File_Pymailmerge,
gid_File_filter_xslt,
gid_File_Extra_Fontunxpsprint, gid_File_Extra_Fontunxpsprint,
gid_File_Extra_Fontunxppds, gid_File_Extra_Fontunxppds,
gid_File_Extra_Fontunxafm); gid_File_Extra_Fontunxafm);

7
scp2/source/xsltfilter/file_xsltfilter.scp
View File

@@ -38,3 +38,10 @@ File gid_File_filter_xhtml
Dir = FILELIST_DIR; Dir = FILELIST_DIR;
Name = "filter_xhtml.filelist"; Name = "filter_xhtml.filelist";
End End
File gid_File_filter_xslt
TXT_FILE_BODY;
Styles = (FILELIST, PACKED);
Dir = FILELIST_DIR;
Name = "filter_xslt.filelist";
End

1
scp2/source/xsltfilter/module_xsltfilter.scp
View File

@@ -26,6 +26,7 @@ Module gid_Module_Optional_Xsltfiltersamples
ParentID = gid_Module_Optional; ParentID = gid_Module_Optional;
Files = ( gid_File_filter_docbook, Files = ( gid_File_filter_docbook,
gid_File_filter_xhtml, gid_File_filter_xhtml,
gid_File_filter_xslt,
gid_File_Share_Registry_Xsltfilter_Xcd ); gid_File_Share_Registry_Xsltfilter_Xcd );
Minimal = NO; Minimal = NO;
Default = YES; Default = YES;