merge some Palm text format filters

Change-Id: I796ce84325549178d3eac572c363a8cbc9ae542f

7 files changed, 8 insertions, 128 deletions

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 850b472e5c25..998487a71891 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -345,14 +345,12 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
 	writer_OOXML_Template \
 	writer_layout_dump_xml \
 	writer_BroadBand_eBook \
-	writer_eReader_eBook \
 	writer_FictionBook_2 \
 	writer_PalmDoc \
 	writer_Plucker_eBook \
-	writer_TealDoc \
-	writer_zTXT \
 	writer_ApplePages \
 	MWAW_Text_Document \
+	Palm_Text_Document \
 ))
 
 $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,filter/source/config/fragments/filters,\
@@ -391,14 +389,12 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
 	OOXML_Text_Template \
 	writer_layout_dump \
 	BroadBand_eBook \
-	eReader_eBook \
 	FictionBook_2 \
 	PalmDoc \
 	Plucker_eBook \
-	TealDoc \
-	zTXT \
 	ApplePages \
 	MWAW_Text_Document \
+	Palm_Text_Document \
 ))
 
 # fcfg_web
diff --git a/filter/source/config/fragments/filters/TealDoc.xcu b/filter/source/config/fragments/filters/Palm_Text_Document.xcu
index e74c154a7a17..4747d3588490 100644
--- a/filter/source/config/fragments/filters/TealDoc.xcu
+++ b/filter/source/config/fragments/filters/Palm_Text_Document.xcu
@@ -7,7 +7,7 @@
  *
 -->
 
-<node oor:name="TealDoc" oor:op="replace">
+<node oor:name="Palm_Text_Document" oor:op="replace">
     <prop oor:name="Flags">
         <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
     </prop>
@@ -15,13 +15,13 @@
         <value>org.libreoffice.comp.Writer.EBookImportFilter</value>
     </prop>
     <prop oor:name="UIName">
-        <value xml:lang="en-US">TealDoc eBook</value>
+        <value xml:lang="en-US">Palm Text Document</value>
     </prop>
     <prop oor:name="FileFormatVersion">
         <value>0</value>
     </prop>
     <prop oor:name="Type">
-        <value>writer_TealDoc</value>
+        <value>Palm_Text_Document</value>
     </prop>
     <prop oor:name="DocumentService">
         <value>com.sun.star.text.TextDocument</value>
diff --git a/filter/source/config/fragments/filters/eReader_eBook.xcu b/filter/source/config/fragments/filters/eReader_eBook.xcu
deleted file mode 100644
index efc86ba327c3..000000000000
--- a/filter/source/config/fragments/filters/eReader_eBook.xcu
+++ /dev/null
@@ -1,29 +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/.
- *
--->
-
-<node oor:name="eReader eBook" oor:op="replace">
-    <prop oor:name="Flags">
-        <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
-    </prop>
-    <prop oor:name="FilterService">
-        <value>org.libreoffice.comp.Writer.EBookImportFilter</value>
-    </prop>
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">eReader eBook</value>
-    </prop>
-    <prop oor:name="FileFormatVersion">
-        <value>0</value>
-    </prop>
-    <prop oor:name="Type">
-        <value>writer_eReader_eBook</value>
-    </prop>
-    <prop oor:name="DocumentService">
-        <value>com.sun.star.text.TextDocument</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/zTXT.xcu b/filter/source/config/fragments/filters/zTXT.xcu
deleted file mode 100644
index 6e5de945d71f..000000000000
--- a/filter/source/config/fragments/filters/zTXT.xcu
+++ /dev/null
@@ -1,29 +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/.
- *
--->
-
-<node oor:name="zTXT" oor:op="replace">
-    <prop oor:name="Flags">
-        <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
-    </prop>
-    <prop oor:name="FilterService">
-        <value>org.libreoffice.comp.Writer.EBookImportFilter</value>
-    </prop>
-    <prop oor:name="UIName">
-        <value xml:lang="en-US">zTXT eBook</value>
-    </prop>
-    <prop oor:name="FileFormatVersion">
-        <value>0</value>
-    </prop>
-    <prop oor:name="Type">
-        <value>writer_zTXT</value>
-    </prop>
-    <prop oor:name="DocumentService">
-        <value>com.sun.star.text.TextDocument</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/types/writer_zTXT.xcu b/filter/source/config/fragments/types/Palm_Text_Document.xcu
index 95cbc08abf91..e067f9f0af5f 100644
--- a/filter/source/config/fragments/types/writer_zTXT.xcu
+++ b/filter/source/config/fragments/types/Palm_Text_Document.xcu
@@ -7,7 +7,7 @@
  *
 -->
 
-<node oor:name="writer_zTXT" oor:op="replace">
+<node oor:name="Palm_Text_Document" oor:op="replace">
     <prop oor:name="DetectService">
         <value>org.libreoffice.comp.Writer.EBookImportFilter</value>
     </prop>
@@ -21,9 +21,9 @@
         <value>true</value>
     </prop>
     <prop oor:name="PreferredFilter">
-        <value>zTXT</value>
+        <value>Palm_Text_Document</value>
     </prop>
     <prop oor:name="UIName">
-        <value>zTXT eBook</value>
+        <value>Palm Text Document</value>
     </prop>
 </node>
diff --git a/filter/source/config/fragments/types/writer_TealDoc.xcu b/filter/source/config/fragments/types/writer_TealDoc.xcu
deleted file mode 100644
index 26c13da3c485..000000000000
--- a/filter/source/config/fragments/types/writer_TealDoc.xcu
+++ /dev/null
@@ -1,29 +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/.
- *
--->
-
-<node oor:name="writer_TealDoc" oor:op="replace">
-    <prop oor:name="DetectService">
-        <value>org.libreoffice.comp.Writer.EBookImportFilter</value>
-    </prop>
-    <prop oor:name="Extensions">
-        <value>pdb</value>
-    </prop>
-    <prop oor:name="MediaType">
-        <value>application/vnd.palm</value>
-    </prop>
-    <prop oor:name="Preferred">
-        <value>true</value>
-    </prop>
-    <prop oor:name="PreferredFilter">
-        <value>TealDoc</value>
-    </prop>
-    <prop oor:name="UIName">
-        <value>TealDoc eBook</value>
-    </prop>
-</node>
diff --git a/filter/source/config/fragments/types/writer_eReader_eBook.xcu b/filter/source/config/fragments/types/writer_eReader_eBook.xcu
deleted file mode 100644
index e0908720b616..000000000000
--- a/filter/source/config/fragments/types/writer_eReader_eBook.xcu
+++ /dev/null
@@ -1,29 +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/.
- *
--->
-
-<node oor:name="writer_eReader_eBook" oor:op="replace">
-    <prop oor:name="DetectService">
-        <value>org.libreoffice.comp.Writer.EBookImportFilter</value>
-    </prop>
-    <prop oor:name="Extensions">
-        <value>pdb</value>
-    </prop>
-    <prop oor:name="MediaType">
-        <value>application/vnd.palm</value>
-    </prop>
-    <prop oor:name="Preferred">
-        <value>true</value>
-    </prop>
-    <prop oor:name="PreferredFilter">
-        <value>eReader eBook</value>
-    </prop>
-    <prop oor:name="UIName">
-        <value>eReader eBook</value>
-    </prop>
-</node>