Some fixes for mwaw-based filters

Change-Id: Ibb517b9a4690f20baa423472c001314a4d4c43f7

17 files changed, 83 insertions, 20 deletions

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 7ca392c81749..192a68f565d6 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -338,7 +338,9 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
 	writer_MindWrite \
 	writer_Nisus_Writer \
 	writer_TeachText \
+	writer_TexEdit \
 	writer_WriteNow \
+	writer_WriterPlus \
 	writer_ZWrite \
 	writer_T602_Document \
 	writer_LotusWordPro_Document \
@@ -372,7 +374,6 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi
 	DocMaker \
 	eDoc_Document \
 	FullWrite_Professional \
-	HanMac_Word_J \
 	HanMac_Word_K \
 	LightWayText \
 	Mac_Word \
@@ -383,7 +384,9 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi
 	MindWrite \
 	Nisus_Writer \
 	TeachText \
+	TexEdit \
 	WriteNow \
+	WriterPlus \
 	ZWrite \
 	T602Document \
 	LotusWordPro \
diff --git a/filter/source/config/fragments/filters/DocMaker.xcu b/filter/source/config/fragments/filters/DocMaker.xcu
index 968abdc9d2c7..9170686bd3b7 100644
--- a/filter/source/config/fragments/filters/DocMaker.xcu
+++ b/filter/source/config/fragments/filters/DocMaker.xcu
@@ -21,7 +21,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
         <prop oor:name="UserData"><value></value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">DocMaker (v4) Document</value>
+            <value xml:lang="x-default">DOCMaker (v4) Document</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>0</value></prop>
         <prop oor:name="Type"><value>writer_DocMaker</value></prop>
diff --git a/filter/source/config/fragments/filters/Mariner_Write.xcu b/filter/source/config/fragments/filters/Mariner_Write.xcu
index 42f140eddcfa..e5a342f21d14 100644
--- a/filter/source/config/fragments/filters/Mariner_Write.xcu
+++ b/filter/source/config/fragments/filters/Mariner_Write.xcu
@@ -21,7 +21,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
         <prop oor:name="UserData"><value></value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">Mariner Write v1.6 - v3.5</value>
+            <value xml:lang="x-default">Mariner Write Mac Classic v1.6 - v3.5</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>0</value></prop>
         <prop oor:name="Type"><value>writer_Mariner_Write</value></prop>
diff --git a/filter/source/config/fragments/filters/Nisus_Writer.xcu b/filter/source/config/fragments/filters/Nisus_Writer.xcu
index 02df22783a26..66403e53e06c 100644
--- a/filter/source/config/fragments/filters/Nisus_Writer.xcu
+++ b/filter/source/config/fragments/filters/Nisus_Writer.xcu
@@ -21,7 +21,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
         <prop oor:name="UserData"><value></value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">Nisus Writer Document v3.4 - 6.5</value>
+            <value xml:lang="x-default">Nisus Writer Mac Classic v3.4 - 6.5</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>0</value></prop>
         <prop oor:name="Type"><value>writer_Nisus_Writer</value></prop>
diff --git a/filter/source/config/fragments/filters/TexEdit.xcu b/filter/source/config/fragments/filters/TexEdit.xcu
index 36b353d91d06..d505f85da680 100644
--- a/filter/source/config/fragments/filters/TexEdit.xcu
+++ b/filter/source/config/fragments/filters/TexEdit.xcu
@@ -21,6 +21,36 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
         <prop oor:name="UserData"><value></value></prop>
         <prop oor:name="UIName">
+            <value xml:lang="x-default">TexEdit v2 Document</value>
+        </prop>
+        <prop oor:name="FileFormatVersion"><value>0</value></prop>
+        <prop oor:name="Type"><value>writer_TexEdit</value></prop>
+        <prop oor:name="TemplateName"/>
+        <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+    </node>
+<!--
+ * 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="TexEdit" oor:op="replace">
+        <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop>
+        <prop oor:name="UIComponent"/>
+        <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
+        <prop oor:name="UserData"><value></value></prop>
+        <prop oor:name="UIName">
             <value xml:lang="x-default">Tex-Edit v2 Document</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>0</value></prop>
diff --git a/filter/source/config/fragments/filters/WriterPlus.xcu b/filter/source/config/fragments/filters/WriterPlus.xcu
index 51f102672cdf..fbf016f6cbac 100644
--- a/filter/source/config/fragments/filters/WriterPlus.xcu
+++ b/filter/source/config/fragments/filters/WriterPlus.xcu
@@ -15,6 +15,36 @@
  *   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="WriterPlus" oor:op="replace">
+        <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop>
+        <prop oor:name="UIComponent"/>
+        <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
+        <prop oor:name="UserData"><value></value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="x-default">WriterPlus</value>
+        </prop>
+        <prop oor:name="FileFormatVersion"><value>0</value></prop>
+        <prop oor:name="Type"><value>writer_WriterPlus</value></prop>
+        <prop oor:name="TemplateName"/>
+        <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
+    </node>
+<!--
+ * 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="WritePlus" oor:op="replace">
         <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop>
         <prop oor:name="UIComponent"/>
diff --git a/filter/source/config/fragments/filters/eDoc_Document.xcu b/filter/source/config/fragments/filters/eDoc_Document.xcu
index f9430dd24601..122f5b28e595 100644
--- a/filter/source/config/fragments/filters/eDoc_Document.xcu
+++ b/filter/source/config/fragments/filters/eDoc_Document.xcu
@@ -21,7 +21,7 @@
         <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
         <prop oor:name="UserData"><value></value></prop>
         <prop oor:name="UIName">
-            <value xml:lang="x-default">eDoc (v2) Document</value>
+            <value xml:lang="x-default">eDOC (v2) Document</value>
         </prop>
         <prop oor:name="FileFormatVersion"><value>0</value></prop>
         <prop oor:name="Type"><value>writer_eDoc_Document</value></prop>
diff --git a/filter/source/config/fragments/types/writer_DocMaker.xcu b/filter/source/config/fragments/types/writer_DocMaker.xcu
index 90b49318000f..c8f8e88d829e 100644
--- a/filter/source/config/fragments/types/writer_DocMaker.xcu
+++ b/filter/source/config/fragments/types/writer_DocMaker.xcu
@@ -18,12 +18,12 @@
     <node oor:name="writer_DocMaker" oor:op="replace" >
         <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
         <prop oor:name="URLPattern"/>
-        <prop oor:name="Extensions"><value>dummy</value></prop>
+        <prop oor:name="Extensions"><value>hqx zip</value></prop>
         <prop oor:name="MediaType"><value></value></prop>
         <prop oor:name="Preferred"><value>true</value></prop>
         <prop oor:name="PreferredFilter"><value>DocMaker</value></prop>
         <prop oor:name="UIName">
-            <value>DocMaker (v4) Document</value>
+            <value>DOCMaker (v4) Document</value>
         </prop>
         <prop oor:name="ClipboardFormat"/>
     </node>
diff --git a/filter/source/config/fragments/types/writer_LightWayText.xcu b/filter/source/config/fragments/types/writer_LightWayText.xcu
index 33f3c31be71e..bf28d0720e46 100644
--- a/filter/source/config/fragments/types/writer_LightWayText.xcu
+++ b/filter/source/config/fragments/types/writer_LightWayText.xcu
@@ -18,7 +18,7 @@
     <node oor:name="writer_LightWayText" oor:op="replace" >
         <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
         <prop oor:name="URLPattern"/>
-        <prop oor:name="Extensions"><value>dummy</value></prop>
+        <prop oor:name="Extensions"><value>hqx zip</value></prop>
         <prop oor:name="MediaType"><value></value></prop>
         <prop oor:name="Preferred"><value>true</value></prop>
         <prop oor:name="PreferredFilter"><value>LightWayText</value></prop>
diff --git a/filter/source/config/fragments/types/writer_Mariner_Write.xcu b/filter/source/config/fragments/types/writer_Mariner_Write.xcu
index 166c6627fe51..d3df7576df9b 100644
--- a/filter/source/config/fragments/types/writer_Mariner_Write.xcu
+++ b/filter/source/config/fragments/types/writer_Mariner_Write.xcu
@@ -23,7 +23,7 @@
         <prop oor:name="Preferred"><value>true</value></prop>
         <prop oor:name="PreferredFilter"><value>Mariner_Write</value></prop>
         <prop oor:name="UIName">
-            <value>Mariner Write v1.6 - v3.5</value>
+            <value>Mariner Write Mac Classic v1.6 - v3.5</value>
         </prop>
         <prop oor:name="ClipboardFormat"/>
     </node>
diff --git a/filter/source/config/fragments/types/writer_Nisus_Writer.xcu b/filter/source/config/fragments/types/writer_Nisus_Writer.xcu
index a8b5b2fe9318..490fd05a80ba 100644
--- a/filter/source/config/fragments/types/writer_Nisus_Writer.xcu
+++ b/filter/source/config/fragments/types/writer_Nisus_Writer.xcu
@@ -18,12 +18,12 @@
     <node oor:name="writer_Nisus_Writer" oor:op="replace" >
         <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
         <prop oor:name="URLPattern"/>
-        <prop oor:name="Extensions"><value>dummy</value></prop>
+        <prop oor:name="Extensions"><value>hqx zip</value></prop>
         <prop oor:name="MediaType"><value></value></prop>
         <prop oor:name="Preferred"><value>true</value></prop>
         <prop oor:name="PreferredFilter"><value>Nisus_Writer</value></prop>
         <prop oor:name="UIName">
-            <value>Nisus Writer Document v3.4 - 6.5</value>
+            <value>Nisus Writer Mac Classic v3.4 - 6.5</value>
         </prop>
         <prop oor:name="ClipboardFormat"/>
     </node>
diff --git a/filter/source/config/fragments/types/writer_TeachText.xcu b/filter/source/config/fragments/types/writer_TeachText.xcu
index 8f580f655f91..073ad056ccf3 100644
--- a/filter/source/config/fragments/types/writer_TeachText.xcu
+++ b/filter/source/config/fragments/types/writer_TeachText.xcu
@@ -18,7 +18,7 @@
     <node oor:name="writer_TeachText" oor:op="replace" >
         <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
         <prop oor:name="URLPattern"/>
-        <prop oor:name="Extensions"><value>dummy</value></prop>
+        <prop oor:name="Extensions"><value>hqx zip</value></prop>
         <prop oor:name="MediaType"><value></value></prop>
         <prop oor:name="Preferred"><value>true</value></prop>
         <prop oor:name="PreferredFilter"><value>TeachText</value></prop>
diff --git a/filter/source/config/fragments/types/writer_TexEdit.xcu b/filter/source/config/fragments/types/writer_TexEdit.xcu
index 695526de22b9..9ffd87f141d1 100644
--- a/filter/source/config/fragments/types/writer_TexEdit.xcu
+++ b/filter/source/config/fragments/types/writer_TexEdit.xcu
@@ -18,10 +18,10 @@
     <node oor:name="writer_TexEdit" oor:op="replace" >
         <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
         <prop oor:name="URLPattern"/>
-        <prop oor:name="Extensions"><value>dummy</value></prop>
+        <prop oor:name="Extensions"><value>hqx zip</value></prop>
         <prop oor:name="MediaType"><value></value></prop>
         <prop oor:name="Preferred"><value>true</value></prop>
-        <prop oor:name="PreferredFilter">TexEdit<value></value></prop>
+        <prop oor:name="PreferredFilter"><value>TexEdit</value></prop>
         <prop oor:name="UIName">
             <value>Tex-Edit v2 Document</value>
         </prop>
diff --git a/filter/source/config/fragments/types/writer_WriterPlus.xcu b/filter/source/config/fragments/types/writer_WriterPlus.xcu
index 6e8a3b37be3b..934ae1217900 100644
--- a/filter/source/config/fragments/types/writer_WriterPlus.xcu
+++ b/filter/source/config/fragments/types/writer_WriterPlus.xcu
@@ -21,7 +21,7 @@
         <prop oor:name="Extensions"><value>dummy</value></prop>
         <prop oor:name="MediaType"><value></value></prop>
         <prop oor:name="Preferred"><value>true</value></prop>
-        <prop oor:name="PreferredFilter">WriterPlus<value></value></prop>
+        <prop oor:name="PreferredFilter"><value>WriterPlus</value></prop>
         <prop oor:name="UIName">
             <value>Writer Plus Document</value>
         </prop>
diff --git a/filter/source/config/fragments/types/writer_ZWrite.xcu b/filter/source/config/fragments/types/writer_ZWrite.xcu
index 1e2d809e063f..eeebe3f72374 100644
--- a/filter/source/config/fragments/types/writer_ZWrite.xcu
+++ b/filter/source/config/fragments/types/writer_ZWrite.xcu
@@ -18,7 +18,7 @@
     <node oor:name="writer_ZWrite" oor:op="replace" >
         <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
         <prop oor:name="URLPattern"/>
-        <prop oor:name="Extensions"><value>dummy</value></prop>
+        <prop oor:name="Extensions"><value>hqx zip</value></prop>
         <prop oor:name="MediaType"><value></value></prop>
         <prop oor:name="Preferred"><value>true</value></prop>
         <prop oor:name="PreferredFilter"><value>ZWrite</value></prop>
diff --git a/filter/source/config/fragments/types/writer_eDoc_Document.xcu b/filter/source/config/fragments/types/writer_eDoc_Document.xcu
index 8e58100fbef2..26b1abeb8ed1 100644
--- a/filter/source/config/fragments/types/writer_eDoc_Document.xcu
+++ b/filter/source/config/fragments/types/writer_eDoc_Document.xcu
@@ -18,12 +18,12 @@
     <node oor:name="writer_eDoc_Document" oor:op="replace" >
         <prop oor:name="DetectService"><value>com.sun.star.comp.Writer.MWAWImportFilter</value></prop>
         <prop oor:name="URLPattern"/>
-        <prop oor:name="Extensions"><value>dummy</value></prop>
+        <prop oor:name="Extensions"><value>hqx zip</value></prop>
         <prop oor:name="MediaType"><value></value></prop>
         <prop oor:name="Preferred"><value>true</value></prop>
         <prop oor:name="PreferredFilter">eDoc_Document<value></value></prop>
         <prop oor:name="UIName">
-            <value>eDoc (v2) Document</value>
+            <value>eDOC (v2) Document</value>
         </prop>
         <prop oor:name="ClipboardFormat"/>
     </node>
diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx
index 9c3e989af6f1..828d46841c11 100644
--- a/writerperfect/source/writer/MWAWImportFilter.cxx
+++ b/writerperfect/source/writer/MWAWImportFilter.cxx
@@ -971,13 +971,13 @@ throw( com::sun::star::uno::RuntimeException )
                 sTypeName = "writer_TeachText";
                 break;
             case MWAWDocument::TEDIT: // Tex-Edit v2
-                sTypeName = "writer_TexEDit";
+                sTypeName = "writer_TexEdit";
                 break;
             case MWAWDocument::WNOW: // WriteNow
                 sTypeName = "writer_WriteNow";
                 break;
             case MWAWDocument::WPLUS: // writerplus document
-                sTypeName = "writer_WritePlus";
+                sTypeName = "writer_WriterPlus";
                 break;
             case MWAWDocument::ZWRT: // Z-Write : v1.3
                 sTypeName = "writer_ZWrite";