[Libreoffice-commits] core.git: 7 commits - filter/Configuration_filter.mk filter/source solenv/bin

David Tardon dtardon at redhat.com
Wed Jan 14 08:43:57 PST 2015


 filter/Configuration_filter.mk                                                                           |  275 +---
 filter/source/config/fragments/filters/HTML.xcu                                                          |    3 
 filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu                                             |   22 
 filter/source/config/fragments/filters/HTML__StarCalc_.xcu                                               |    3 
 filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu                                            |   22 
 filter/source/config/fragments/filters/HTML__StarWriter_.xcu                                             |    3 
 filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu                                          |   22 
 filter/source/config/fragments/filters/HTML_ui.xcu                                                       |   22 
 filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu                                             |    3 
 filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu                                          |   22 
 filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template.xcu                                 |    5 
 filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu                              |   22 
 filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu                              |    5 
 filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu                           |   22 
 filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu                                  |    5 
 filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu                               |   22 
 filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu                                  |    5 
 filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu                               |   22 
 filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu                                      |    3 
 filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu                                   |   22 
 filter/source/config/fragments/filters/MS_Word_2003_XML.xcu                                              |    3 
 filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu                                           |   22 
 filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu                                  |   22 
 filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu                                           |   22 
 filter/source/config/fragments/filters/MS_Word_95_Vorlage.xcu                                            |    3 
 filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu                                         |   22 
 filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu                                            |    3 
 filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu                                         |   22 
 filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu                                        |   22 
 filter/source/config/fragments/filters/OOXML_Text_ui.xcu                                                 |   22 
 filter/source/config/fragments/filters/StarBaseReport.xcu                                                |    3 
 filter/source/config/fragments/filters/StarBaseReportChart.xcu                                           |    3 
 filter/source/config/fragments/filters/StarBaseReportChart_ui.xcu                                        |   22 
 filter/source/config/fragments/filters/StarBaseReport_ui.xcu                                             |   22 
 filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu                                         |    3 
 filter/source/config/fragments/filters/StarOffice_XML__Base__ui.xcu                                      |   22 
 filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu                                         |    3 
 filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu                                      |   22 
 filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu                                        |    3 
 filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu                                     |   22 
 filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu                                         |    3 
 filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu                                      |   22 
 filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu                                      |    3 
 filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu                                   |   22 
 filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu                                         |    3 
 filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu                                      |   22 
 filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu                                       |    3 
 filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu                                    |   22 
 filter/source/config/fragments/filters/Text.xcu                                                          |    3 
 filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu                                         |    3 
 filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu                                      |   22 
 filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu                                   |    3 
 filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu                                |   22 
 filter/source/config/fragments/filters/Text__encoded_.xcu                                                |    3 
 filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu                    |    3 
 filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu                 |   22 
 filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu                               |    3 
 filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu                            |   22 
 filter/source/config/fragments/filters/Text__encoded__ui.xcu                                             |   22 
 filter/source/config/fragments/filters/Text_ui.xcu                                                       |   22 
 filter/source/config/fragments/filters/UOF_presentation.xcu                                              |    2 
 filter/source/config/fragments/filters/UOF_presentation_ui.xcu                                           |   22 
 filter/source/config/fragments/filters/UOF_spreadsheet.xcu                                               |    2 
 filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu                                            |   22 
 filter/source/config/fragments/filters/UOF_text.xcu                                                      |    2 
 filter/source/config/fragments/filters/UOF_text_ui.xcu                                                   |   22 
 filter/source/config/fragments/filters/calc8.xcu                                                         |    3 
 filter/source/config/fragments/filters/calc8_template.xcu                                                |    3 
 filter/source/config/fragments/filters/calc8_template_ui.xcu                                             |   22 
 filter/source/config/fragments/filters/calc8_ui.xcu                                                      |   22 
 filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu                                            |    3 
 filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu                                         |   22 
 filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu                                     |    5 
 filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu                                  |   22 
 filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu                                        |    5 
 filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu                               |    5 
 filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu                            |   22 
 filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu                                     |   22 
 filter/source/config/fragments/filters/calc_OOXML.xcu                                                    |    5 
 filter/source/config/fragments/filters/calc_OOXML_Template.xcu                                           |    5 
 filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu                                        |   22 
 filter/source/config/fragments/filters/calc_OOXML_ui.xcu                                                 |   22 
 filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu                             |    3 
 filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu                          |   22 
 filter/source/config/fragments/filters/chart8.xcu                                                        |    3 
 filter/source/config/fragments/filters/chart8_ui.xcu                                                     |   22 
 filter/source/config/fragments/filters/draw8.xcu                                                         |    3 
 filter/source/config/fragments/filters/draw8_template.xcu                                                |    3 
 filter/source/config/fragments/filters/draw8_template_ui.xcu                                             |   22 
 filter/source/config/fragments/filters/draw8_ui.xcu                                                      |   22 
 filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu                             |    3 
 filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu                          |   22 
 filter/source/config/fragments/filters/draw_html_Export.xcu                                              |    3 
 filter/source/config/fragments/filters/draw_html_Export_ui.xcu                                           |   22 
 filter/source/config/fragments/filters/impress8.xcu                                                      |    3 
 filter/source/config/fragments/filters/impress8_draw.xcu                                                 |    3 
 filter/source/config/fragments/filters/impress8_draw_ui.xcu                                              |   22 
 filter/source/config/fragments/filters/impress8_template.xcu                                             |    3 
 filter/source/config/fragments/filters/impress8_template_ui.xcu                                          |   22 
 filter/source/config/fragments/filters/impress8_ui.xcu                                                   |   22 
 filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML.xcu                                |    5 
 filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template_ui.xcu                    |   22 
 filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_ui.xcu                             |   22 
 filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu                                     |   22 
 filter/source/config/fragments/filters/impress_OOXML_ui.xcu                                              |   22 
 filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu                                   |    3 
 filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu                                |   22 
 filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu                       |    3 
 filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu                    |   22 
 filter/source/config/fragments/filters/impress_html_Export.xcu                                           |    3 
 filter/source/config/fragments/filters/impress_html_Export_ui.xcu                                        |   22 
 filter/source/config/fragments/filters/math8.xcu                                                         |    3 
 filter/source/config/fragments/filters/math8_ui.xcu                                                      |   22 
 filter/source/config/fragments/filters/writer8.xcu                                                       |    3 
 filter/source/config/fragments/filters/writer8_template.xcu                                              |    3 
 filter/source/config/fragments/filters/writer8_template_ui.xcu                                           |   22 
 filter/source/config/fragments/filters/writer8_ui.xcu                                                    |   22 
 filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu                         |    3 
 filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu                      |   22 
 filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu                   |    3 
 filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu    |    3 
 filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu |   22 
 filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu                |   22 
 filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer.xcu                              |    3 
 filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu                 |    3 
 filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu              |   22 
 filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu                           |   22 
 filter/source/config/fragments/filters/writerglobal8.xcu                                                 |    3 
 filter/source/config/fragments/filters/writerglobal8_template.xcu                                        |    3 
 filter/source/config/fragments/filters/writerglobal8_template_ui.xcu                                     |   12 
 filter/source/config/fragments/filters/writerglobal8_ui.xcu                                              |   22 
 filter/source/config/fragments/filters/writerglobal8_writer.xcu                                          |    3 
 filter/source/config/fragments/filters/writerglobal8_writer_ui.xcu                                       |   22 
 filter/source/config/fragments/filters/writerweb8_writer.xcu                                             |    3 
 filter/source/config/fragments/filters/writerweb8_writer_template.xcu                                    |    3 
 filter/source/config/fragments/filters/writerweb8_writer_template_ui.xcu                                 |   22 
 filter/source/config/fragments/filters/writerweb8_writer_ui.xcu                                          |   22 
 filter/source/config/fragments/langfilter.xsl                                                            |    3 
 filter/source/config/tools/Manifest.mf                                                                   |    4 
 filter/source/config/tools/split/FCFGSplit.cfg                                                           |  128 --
 filter/source/config/tools/split/FCFGSplit.java                                                          |  556 ----------
 filter/source/config/tools/split/Manifest.mf                                                             |    1 
 filter/source/config/tools/split/Splitter.java                                                           |  298 -----
 filter/source/config/tools/split/SplitterData.java                                                       |   78 -
 solenv/bin/packregistry.xslt                                                                             |    1 
 145 files changed, 288 insertions(+), 2839 deletions(-)

New commits:
commit 5d656f212fe1a6875cdf638b3d8bf2179e34152e
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jan 14 17:32:11 2015 +0100

    remove unneeded UI fragments
    
    Change-Id: I8e004e7261420354f7e383f4a5b4a1170476e8ba

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 4a45714..d791909 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -295,10 +295,6 @@ $(eval $(call filter_Configuration_add_others,fcfg_langpack,fcfg_database_others
 	frameloaders/org_openoffice_comp_dbflt_DBContentLoader2 \
 ))
 
-$(eval $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
-	StarOffice_XML__Base__ui \
-))
-
 # fcfg_reportbuilder
 $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_reportbuilder_types.xcu,filter/source/config/fragments/types,\
 	StarBaseReport \
@@ -310,11 +306,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_reportbuilder_
 	StarBaseReportChart \
 ))
 
-$(eval $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
-	StarBaseReport_ui \
-	StarBaseReportChart_ui \
-))
-
 # fcfg_writer
 $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter/source/config/fragments/types,\
 	generic_HTML \
@@ -442,22 +433,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
 	zTXT \
 ))
 
-$(eval $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
-	HTML__StarWriter__ui \
-	MS_Word_95_Vorlage_ui \
-	MS_Word_97_Vorlage_ui \
-	StarOffice_XML__Writer__ui \
-	Text_ui \
-	Text__encoded__ui \
-	writer_StarOffice_XML_Writer_Template_ui \
-	writer8_ui \
-	writer8_template_ui \
-	MS_Word_2007_XML_ui \
-	MS_Word_2007_XML_Template_ui \
-	OOXML_Text_ui \
-	OOXML_Text_Template_ui \
-))
-
 # fcfg_web
 $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_web_types.xcu,filter/source/config/fragments/types,\
 	generic_HTML \
@@ -481,16 +456,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_web_filters.xc
 	writerweb8_writer \
 ))
 
-$(eval $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
-	HTML_ui \
-	Text__StarWriter_Web__ui \
-	Text__encoded___StarWriter_Web__ui \
-	writer_web_StarOffice_XML_Writer_ui \
-	writer_web_StarOffice_XML_Writer_Web_Template_ui \
-	writerweb8_writer_template_ui \
-	writerweb8_writer_ui \
-))
-
 # fcfg_global
 $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_global_types.xcu,filter/source/config/fragments/types,\
 	generic_Text \
@@ -512,15 +477,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_global_filters
 	writerglobal8_HTML \
 ))
 
-$(eval $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
-	Text__encoded___StarWriter_GlobalDocument__ui \
-	writer_globaldocument_StarOffice_XML_Writer_ui \
-	writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui \
-	writerglobal8_ui \
-	writerglobal8_template_ui \
-	writerglobal8_writer_ui \
-))
-
 # fcfg_calc
 $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,filter/source/config/fragments/types,\
 	calc_DIF \
@@ -598,25 +554,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.x
 	Mac_Works_Calc \
 ))
 
-$(eval $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
-	HTML__StarCalc__ui \
-	MS_Excel_4_0_Vorlage_Template_ui \
-	MS_Excel_5_0_95_Vorlage_Template_ui \
-	MS_Excel_95_Vorlage_Template_ui \
-	MS_Excel_97_Vorlage_Template_ui \
-	StarOffice_XML__Calc__ui \
-	Text___txt___csv__StarCalc__ui \
-	calc_HTML_WebQuery_ui \
-	calc_StarOffice_XML_Calc_Template_ui \
-	calc8_ui \
-	calc8_template_ui \
-	calc_MS_Excel_2007_XML_ui \
-	calc_MS_Excel_2007_XML_Template_ui \
-	calc_MS_Excel_2007_Binary_ui \
-	calc_OOXML_ui \
-	calc_OOXML_Template_ui \
-))
-
 # fcfg_draw
 $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/source/config/fragments/types,\
 	draw_ODG_FlatXML \
@@ -667,13 +604,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.x
 	PageMakerDocument \
 ))
 
-$(eval $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
-	StarOffice_XML__Draw__ui \
-	draw_StarOffice_XML_Draw_Template_ui \
-	draw8_ui \
-	draw8_template_ui \
-))
-
 # fcfg_impress
 $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_impress_types.xcu,filter/source/config/fragments/types,\
 	draw_StarOffice_XML_Draw \
@@ -721,20 +651,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impress_filter
 	ClarisWorks_Impress \
 ))
 
-$(eval $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
-	MS_PowerPoint_97_Vorlage_ui \
-	impress_StarOffice_XML_Draw_ui \
-	StarOffice_XML__Impress__ui \
-	impress_StarOffice_XML_Impress_Template_ui \
-	impress8_ui \
-	impress8_template_ui \
-	impress8_draw_ui \
-	impress_MS_PowerPoint_2007_XML_ui \
-	impress_MS_PowerPoint_2007_XML_Template_ui \
-	impress_OOXML_ui \
-	impress_OOXML_Template_ui \
-))
-
 # fcfg_chart
 $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_chart_types.xcu,filter/source/config/fragments/types,\
 	chart_StarOffice_XML_Chart \
@@ -750,11 +666,6 @@ $(eval $(call filter_Configuration_add_others,fcfg_langpack,fcfg_chart_others.xc
 	frameloaders/com_sun_star_comp_chart2_ChartFrameLoader \
 ))
 
-$(eval $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
-	StarOffice_XML__Chart__ui \
-	chart8_ui \
-))
-
 # fcfg_math
 $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_math_types.xcu,filter/source/config/fragments/types,\
 	math_MathML_XML_Math \
@@ -772,11 +683,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_math_filters.x
 	math8 \
 ))
 
-$(eval $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
-	StarOffice_XML__Math__ui \
-	math8_ui \
-))
-
 # fcfg_drawgraphics
 $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_drawgraphics_types.xcu,filter/source/config/fragments/types,\
 	bmp_MS_Windows \
@@ -861,10 +767,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_drawgraphics_f
 	draw_xpm_Export \
 ))
 
-$(eval $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
-	draw_html_Export_ui \
-))
-
 # fcfg_impressgraphics
 $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_impressgraphics_types.xcu,filter/source/config/fragments/types,\
 	bmp_MS_Windows \
@@ -912,10 +814,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impressgraphic
 	impress_xpm_Export \
 ))
 
-$(eval $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
-	impress_html_Export_ui \
-))
-
 # fcfg_writergraphics
 $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writergraphics_types.xcu,filter/source/config/fragments/types,\
 	jpg_JPEG \
@@ -1031,9 +929,4 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_xslt_filters.x
 	UOF_presentation \
 ))
 
-$(eval $(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:
diff --git a/filter/source/config/fragments/filters/HTML.xcu b/filter/source/config/fragments/filters/HTML.xcu
index 1dbbbcb..79647f3 100644
--- a/filter/source/config/fragments/filters/HTML.xcu
+++ b/filter/source/config/fragments/filters/HTML.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>generic_HTML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">HTML Document</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu b/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu
deleted file mode 100644
index a3ae5b2..0000000
--- a/filter/source/config/fragments/filters/HTML_MasterDoc_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="HTML_MasterDoc">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document (Master Document)</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/HTML__StarCalc_.xcu b/filter/source/config/fragments/filters/HTML__StarCalc_.xcu
index 70dc521..9e731b3 100644
--- a/filter/source/config/fragments/filters/HTML__StarCalc_.xcu
+++ b/filter/source/config/fragments/filters/HTML__StarCalc_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>generic_HTML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">HTML Document (Calc)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu b/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu
deleted file mode 100644
index db29def..0000000
--- a/filter/source/config/fragments/filters/HTML__StarCalc__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="HTML (StarCalc)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document (Calc)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/HTML__StarWriter_.xcu b/filter/source/config/fragments/filters/HTML__StarWriter_.xcu
index 84bddfd..e60154b 100644
--- a/filter/source/config/fragments/filters/HTML__StarWriter_.xcu
+++ b/filter/source/config/fragments/filters/HTML__StarWriter_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>generic_HTML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">HTML Document (Writer)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu b/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu
deleted file mode 100644
index a03418f..0000000
--- a/filter/source/config/fragments/filters/HTML__StarWriter__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="HTML (StarWriter)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document (Writer)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/HTML_ui.xcu b/filter/source/config/fragments/filters/HTML_ui.xcu
deleted file mode 100644
index d8dde11..0000000
--- a/filter/source/config/fragments/filters/HTML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="HTML">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">HTML Document</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu
index f283b57..729a73a 100644
--- a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>calc_MS_Excel_2003_XML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Excel 2003 XML</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu
deleted file mode 100644
index 9fa9d9e..0000000
--- a/filter/source/config/fragments/filters/MS_Excel_2003_XML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Excel 2003 XML">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Excel 2003 XML</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template.xcu
index 8bee0c3..1e724cd 100644
--- a/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>calc_MS_Excel_40_VorlageTemplate</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Excel 4.0 Template</value>
+        </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu
deleted file mode 100644
index de31dc6..0000000
--- a/filter/source/config/fragments/filters/MS_Excel_4_0_Vorlage_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Excel 4.0 Vorlage/Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Excel 4.0 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu
index 4542d27..4b8ec72 100644
--- a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>calc_MS_Excel_5095_VorlageTemplate</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Excel 5.0 Template</value>
+        </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu
deleted file mode 100644
index 1ecd280..0000000
--- a/filter/source/config/fragments/filters/MS_Excel_5_0_95_Vorlage_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Excel 5.0/95 Vorlage/Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Excel 5.0 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu
index a5eab88..d4c39a3 100644
--- a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>calc_MS_Excel_95_VorlageTemplate</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Excel 95 Template</value>
+        </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu
deleted file mode 100644
index 89318bb..0000000
--- a/filter/source/config/fragments/filters/MS_Excel_95_Vorlage_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Excel 95 Vorlage/Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Excel 95 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu
index b318540..d82bcaa 100644
--- a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>calc_MS_Excel_97_VorlageTemplate</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Excel 97-2003 Template</value>
+        </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu
deleted file mode 100644
index 14c5a75..0000000
--- a/filter/source/config/fragments/filters/MS_Excel_97_Vorlage_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Excel 97 Vorlage/Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Excel 97-2003 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu
index 6480891..571fde6 100644
--- a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu
+++ b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>impress_MS_PowerPoint_97_Vorlage</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft PowerPoint 97-2003 Template</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu b/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu
deleted file mode 100644
index e1c2eca..0000000
--- a/filter/source/config/fragments/filters/MS_PowerPoint_97_Vorlage_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS PowerPoint 97 Vorlage">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft PowerPoint 97-2003 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
index 56efe87..a3730df 100644
--- a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer_MS_Word_2003_XML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Word 2003 XML</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu
deleted file mode 100644
index 6899e9c..0000000
--- a/filter/source/config/fragments/filters/MS_Word_2003_XML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Word 2003 XML">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Word 2003 XML</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu
deleted file mode 100644
index 5400bf4..0000000
--- a/filter/source/config/fragments/filters/MS_Word_2007_XML_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Word 2007 XML Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Word 2007-2013 XML Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu
deleted file mode 100644
index 923aecd..0000000
--- a/filter/source/config/fragments/filters/MS_Word_2007_XML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Word 2007 XML">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Word 2007-2013 XML</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_95_Vorlage.xcu b/filter/source/config/fragments/filters/MS_Word_95_Vorlage.xcu
index b13ff14..3b2a105 100644
--- a/filter/source/config/fragments/filters/MS_Word_95_Vorlage.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_95_Vorlage.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer_MS_Word_95_Vorlage</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Word 95 Template</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu b/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu
deleted file mode 100644
index ddbb91f..0000000
--- a/filter/source/config/fragments/filters/MS_Word_95_Vorlage_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Word 95 Vorlage">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Word 95 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu b/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu
index fda1125..d75b3e2 100644
--- a/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_97_Vorlage.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer_MS_Word_97_Vorlage</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Microsoft Word 97-2003 Template</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu b/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu
deleted file mode 100644
index 92cc0b5..0000000
--- a/filter/source/config/fragments/filters/MS_Word_97_Vorlage_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="MS Word 97 Vorlage">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Microsoft Word 97-2003 Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu b/filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu
deleted file mode 100644
index d21ebb4..0000000
--- a/filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Office Open XML Text Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Office Open XML Text Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/OOXML_Text_ui.xcu b/filter/source/config/fragments/filters/OOXML_Text_ui.xcu
deleted file mode 100644
index a23d35f..0000000
--- a/filter/source/config/fragments/filters/OOXML_Text_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Office Open XML Text">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Office Open XML Text</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarBaseReport.xcu b/filter/source/config/fragments/filters/StarBaseReport.xcu
index 7c15cb4..c46133d 100644
--- a/filter/source/config/fragments/filters/StarBaseReport.xcu
+++ b/filter/source/config/fragments/filters/StarBaseReport.xcu
@@ -32,4 +32,7 @@
       <prop oor:name="DocumentService">
         <value>com.sun.star.report.ReportDefinition</value>
       </prop>
+      <prop oor:name="UIName">
+        <value xml:lang="en-US">ODF Database Report</value>
+      </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarBaseReportChart.xcu b/filter/source/config/fragments/filters/StarBaseReportChart.xcu
index 738819c..867e417 100644
--- a/filter/source/config/fragments/filters/StarBaseReportChart.xcu
+++ b/filter/source/config/fragments/filters/StarBaseReportChart.xcu
@@ -34,4 +34,7 @@
       <prop oor:name="DocumentService">
         <value>com.sun.star.chart2.ChartDocument</value>
       </prop>
+      <prop oor:name="UIName">
+        <value xml:lang="en-US">OpenOffice.org 1.0 Report Chart</value>
+      </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarBaseReportChart_ui.xcu b/filter/source/config/fragments/filters/StarBaseReportChart_ui.xcu
deleted file mode 100644
index 7f9efe9..0000000
--- a/filter/source/config/fragments/filters/StarBaseReportChart_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Base) Report Chart">
-      <prop oor:name="UIName">
-        <value xml:lang="en-US">OpenOffice.org 1.0 Report Chart</value>
-      </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarBaseReport_ui.xcu b/filter/source/config/fragments/filters/StarBaseReport_ui.xcu
deleted file mode 100644
index d5f07fe..0000000
--- a/filter/source/config/fragments/filters/StarBaseReport_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Base) Report">
-      <prop oor:name="UIName">
-        <value xml:lang="en-US">ODF Database Report</value>
-      </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu
index 0a1fdce..4c33a80 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>StarBase</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sdb.OfficeDatabaseDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Database</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Base__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Base__ui.xcu
deleted file mode 100644
index f3972ed..0000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Base__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Base)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Database</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu
index dbc8bc3..6f658cb 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>calc_StarOffice_XML_Calc</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
deleted file mode 100644
index 722ea2a..0000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Calc)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu
index f84efc0..605671c 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>chart_StarOffice_XML_Chart</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.chart2.ChartDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Chart</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
deleted file mode 100644
index ebc2d35..0000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Chart)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Chart</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu
index a4a6c37..9fdd62b 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>draw_StarOffice_XML_Draw</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Drawing</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
deleted file mode 100644
index 063a415..0000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Draw)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Drawing</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu
index af61108..1a2c24d 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>impress_StarOffice_XML_Impress</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Presentation</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
deleted file mode 100644
index 351d5ad..0000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Impress)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Presentation</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu
index 2f60ca6..569eb57 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>math_StarOffice_XML_Math</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.formula.FormulaProperties</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Formula</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
deleted file mode 100644
index e93ac4d..0000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Math)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Formula</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu
index 698e602..ee3638b 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>writer_StarOffice_XML_Writer</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
deleted file mode 100644
index 40f1485..0000000
--- a/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="StarOffice XML (Writer)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Text Document</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/Text.xcu b/filter/source/config/fragments/filters/Text.xcu
index eacf354..7ce06bc 100644
--- a/filter/source/config/fragments/filters/Text.xcu
+++ b/filter/source/config/fragments/filters/Text.xcu
@@ -25,4 +25,7 @@
         <prop oor:name="Type"><value>generic_Text</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Text</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
index 44787f7..e3d1658 100644
--- a/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
@@ -25,4 +25,7 @@
         <prop oor:name="Type"><value>generic_Text</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Text (Writer/Web)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu b/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu
deleted file mode 100644
index 43f6875..0000000
--- a/filter/source/config/fragments/filters/Text__StarWriter_Web__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Text (StarWriter/Web)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Text (Writer/Web)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
index 905f80a..eab7469 100644
--- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
+++ b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
@@ -25,4 +25,7 @@
         <prop oor:name="Type"><value>generic_Text</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Text CSV</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu b/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu
deleted file mode 100644
index f249ac2..0000000
--- a/filter/source/config/fragments/filters/Text___txt___csv__StarCalc__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Text - txt - csv (StarCalc)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Text CSV</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded_.xcu b/filter/source/config/fragments/filters/Text__encoded_.xcu
index f432260..f4c6f0d 100644
--- a/filter/source/config/fragments/filters/Text__encoded_.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded_.xcu
@@ -25,4 +25,7 @@
         <prop oor:name="Type"><value>generic_Text</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Text - Choose Encoding</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
index 0ee9f0e..2b6a8b0 100644
--- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
@@ -25,4 +25,7 @@
         <prop oor:name="Type"><value>generic_Text</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.GlobalDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Text - Choose Encoding (Master Document)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
deleted file mode 100644
index ea8bdb7..0000000
--- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Text (encoded) (StarWriter/GlobalDocument)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Text - Choose Encoding (Master Document)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu
index 03c3ce3..4e2d92d 100644
--- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu
+++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu
@@ -25,4 +25,7 @@
         <prop oor:name="Type"><value>generic_Text</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Text - Choose Encoding (Writer/Web)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu
deleted file mode 100644
index 5d6fa4b..0000000
--- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Text (encoded) (StarWriter/Web)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Text - Choose Encoding (Writer/Web)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/Text__encoded__ui.xcu b/filter/source/config/fragments/filters/Text__encoded__ui.xcu
deleted file mode 100644
index 81353c9..0000000
--- a/filter/source/config/fragments/filters/Text__encoded__ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Text (encoded)">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Text - Choose Encoding</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/Text_ui.xcu b/filter/source/config/fragments/filters/Text_ui.xcu
deleted file mode 100644
index a457bb9..0000000
--- a/filter/source/config/fragments/filters/Text_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="Text">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Text</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/UOF_presentation.xcu b/filter/source/config/fragments/filters/UOF_presentation.xcu
index 800e9e1..1f8be43 100644
--- a/filter/source/config/fragments/filters/UOF_presentation.xcu
+++ b/filter/source/config/fragments/filters/UOF_presentation.xcu
@@ -24,7 +24,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="UIName">
-            <value>Unified Office Format presentation</value>
+            <value xml:lang="en-US">Unified Office Format presentation</value>
         </prop>
         <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
     </node>
diff --git a/filter/source/config/fragments/filters/UOF_presentation_ui.xcu b/filter/source/config/fragments/filters/UOF_presentation_ui.xcu
deleted file mode 100644
index e1f3902..0000000
--- a/filter/source/config/fragments/filters/UOF_presentation_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="UOF presentation" oor:op="replace">
-         <prop oor:name="UIName">
-            <value xml:lang="en-US">Unified Office Format presentation</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu
index 148131b..91f5643 100644
--- a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu
+++ b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu
@@ -24,7 +24,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="UIName">
-            <value>Unified Office Format spreadsheet</value>
+            <value xml:lang="en-US">Unified Office Format spreadsheet</value>
         </prop>
         <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
     </node>
diff --git a/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu b/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu
deleted file mode 100644
index c5b0434..0000000
--- a/filter/source/config/fragments/filters/UOF_spreadsheet_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="UOF spreadsheet" oor:op="replace">
-         <prop oor:name="UIName">
-            <value xml:lang="en-US">Unified Office Format spreadsheet</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/UOF_text.xcu b/filter/source/config/fragments/filters/UOF_text.xcu
index 0f7d622..e4241f1 100644
--- a/filter/source/config/fragments/filters/UOF_text.xcu
+++ b/filter/source/config/fragments/filters/UOF_text.xcu
@@ -24,7 +24,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="UIName">
-            <value>Unified Office Format text</value>
+            <value xml:lang="en-US">Unified Office Format text</value>
         </prop>
         <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
     </node>
diff --git a/filter/source/config/fragments/filters/UOF_text_ui.xcu b/filter/source/config/fragments/filters/UOF_text_ui.xcu
deleted file mode 100644
index 09b6842..0000000
--- a/filter/source/config/fragments/filters/UOF_text_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="UOF text" oor:op="replace">
-         <prop oor:name="UIName">
-            <value xml:lang="en-US">Unified Office Format text</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/calc8.xcu b/filter/source/config/fragments/filters/calc8.xcu
index 0156461..ddf0aa4 100644
--- a/filter/source/config/fragments/filters/calc8.xcu
+++ b/filter/source/config/fragments/filters/calc8.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>calc8</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Spreadsheet</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/calc8_template.xcu b/filter/source/config/fragments/filters/calc8_template.xcu
index 0b08179..4752a45 100644
--- a/filter/source/config/fragments/filters/calc8_template.xcu
+++ b/filter/source/config/fragments/filters/calc8_template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>calc8_template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Spreadsheet Template</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/calc8_template_ui.xcu b/filter/source/config/fragments/filters/calc8_template_ui.xcu
deleted file mode 100644
index af9c430..0000000
--- a/filter/source/config/fragments/filters/calc8_template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="calc8_template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Spreadsheet Template</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/calc8_ui.xcu b/filter/source/config/fragments/filters/calc8_ui.xcu
deleted file mode 100644
index 8807db2..0000000
--- a/filter/source/config/fragments/filters/calc8_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="calc8">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Spreadsheet</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu b/filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu
index f40a7b2..c91d928 100644
--- a/filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu
+++ b/filter/source/config/fragments/filters/calc_HTML_WebQuery.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>generic_HTML</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">Web Page Query (Calc)</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu b/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu
deleted file mode 100644
index ce0276c..0000000
--- a/filter/source/config/fragments/filters/calc_HTML_WebQuery_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="calc_HTML_WebQuery">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">Web Page Query (Calc)</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu
index f19ac84..24743cf 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>MS Excel 2007 Binary</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+    <prop oor:name="UIName">
+        <value xml:lang="en-US">Microsoft Excel 2007 Binary</value>
+    </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu
deleted file mode 100644
index fecefbb..0000000
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_Binary_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Calc MS Excel 2007 Binary">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Microsoft Excel 2007 Binary</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu
index 555ccb1..13febd1 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>MS Excel 2007 XML</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+    <prop oor:name="UIName">
+        <value xml:lang="en-US">Microsoft Excel 2007-2013 XML</value>
+    </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu
index 2748ae3..91214c8 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>MS Excel 2007 XML Template</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+    <prop oor:name="UIName">
+        <value xml:lang="en-US">Microsoft Excel 2007-2013 XML Template</value>
+    </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu
deleted file mode 100644
index 5250662..0000000
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Calc MS Excel 2007 XML Template">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Microsoft Excel 2007-2013 XML Template</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu
deleted file mode 100644
index 070952a..0000000
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Calc MS Excel 2007 XML">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Microsoft Excel 2007-2013 XML</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/calc_OOXML.xcu b/filter/source/config/fragments/filters/calc_OOXML.xcu
index ce4bc40..2bc0981 100644
--- a/filter/source/config/fragments/filters/calc_OOXML.xcu
+++ b/filter/source/config/fragments/filters/calc_OOXML.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>Office Open XML Spreadsheet</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+    <prop oor:name="UIName">
+        <value xml:lang="en-US">Office Open XML Spreadsheet</value>
+    </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/calc_OOXML_Template.xcu b/filter/source/config/fragments/filters/calc_OOXML_Template.xcu
index 2b70123..848e7ee 100644
--- a/filter/source/config/fragments/filters/calc_OOXML_Template.xcu
+++ b/filter/source/config/fragments/filters/calc_OOXML_Template.xcu
@@ -24,4 +24,7 @@
     <prop oor:name="Type"><value>Office Open XML Spreadsheet Template</value></prop>
     <prop oor:name="TemplateName"/>
     <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
-</node>
+    <prop oor:name="UIName">
+        <value xml:lang="en-US">Office Open XML Spreadsheet Template</value>
+    </prop>
+    </node>
diff --git a/filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu b/filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu
deleted file mode 100644
index e881599..0000000
--- a/filter/source/config/fragments/filters/calc_OOXML_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Calc Office Open XML Template">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Office Open XML Spreadsheet Template</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/calc_OOXML_ui.xcu b/filter/source/config/fragments/filters/calc_OOXML_ui.xcu
deleted file mode 100644
index fc8b971..0000000
--- a/filter/source/config/fragments/filters/calc_OOXML_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<node oor:name="Calc Office Open XML">
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">Office Open XML Spreadsheet</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu
index e7c222f..3c05efa 100644
--- a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu
+++ b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>calc_StarOffice_XML_Calc_Template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet Template</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
deleted file mode 100644
index 2a64e72..0000000
--- a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="calc_StarOffice_XML_Calc_Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet Template</value>
-        </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/chart8.xcu b/filter/source/config/fragments/filters/chart8.xcu
index 36c4e4a..3c33792 100644
--- a/filter/source/config/fragments/filters/chart8.xcu
+++ b/filter/source/config/fragments/filters/chart8.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>chart8</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.chart2.ChartDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Chart</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/chart8_ui.xcu b/filter/source/config/fragments/filters/chart8_ui.xcu
deleted file mode 100644
index 065b189..0000000
--- a/filter/source/config/fragments/filters/chart8_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="chart8">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Chart</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/draw8.xcu b/filter/source/config/fragments/filters/draw8.xcu
index 70167a7..7bdd986 100644
--- a/filter/source/config/fragments/filters/draw8.xcu
+++ b/filter/source/config/fragments/filters/draw8.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>draw8</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Drawing</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/draw8_template.xcu b/filter/source/config/fragments/filters/draw8_template.xcu
index 4103a27..ac4f262 100644
--- a/filter/source/config/fragments/filters/draw8_template.xcu
+++ b/filter/source/config/fragments/filters/draw8_template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>draw8_template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">ODF Drawing Template</value>
+                    </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/draw8_template_ui.xcu b/filter/source/config/fragments/filters/draw8_template_ui.xcu
deleted file mode 100644
index e2aec0f..0000000
--- a/filter/source/config/fragments/filters/draw8_template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="draw8_template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Drawing Template</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/draw8_ui.xcu b/filter/source/config/fragments/filters/draw8_ui.xcu
deleted file mode 100644
index 992c550..0000000
--- a/filter/source/config/fragments/filters/draw8_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="draw8">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">ODF Drawing</value>
-                    </prop>
-    </node>
diff --git a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu
index 5037f8b..7830277 100644
--- a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu
+++ b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu
@@ -24,4 +24,7 @@
         <prop oor:name="Type"><value>draw_StarOffice_XML_Draw_Template</value></prop>
         <prop oor:name="TemplateName"/>
         <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">OpenOffice.org 1.0 Drawing Template</value>
+        </prop>
     </node>
diff --git a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
deleted file mode 100644
index 644e106..0000000
--- a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-    <node oor:name="draw_StarOffice_XML_Draw_Template">
-        <prop oor:name="UIName">
-            <value xml:lang="en-US">OpenOffice.org 1.0 Drawing Template</value>
-        </prop>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list