[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 10 commits - download.lst external/libmwaw filter/Configuration_filter.mk filter/source writerperfect/source
David Tardon
dtardon at redhat.com
Tue Dec 8 13:13:49 PST 2015
download.lst | 4
external/libmwaw/Library_mwaw.mk | 3
external/libmwaw/UnpackedTarball_libmwaw.mk | 1
external/libmwaw/c++11-narrowing.patch | 11 -
filter/Configuration_filter.mk | 82 +-------
filter/source/config/fragments/filters/Beagle_Works.xcu | 29 --
filter/source/config/fragments/filters/Beagle_Works_Calc.xcu | 29 --
filter/source/config/fragments/filters/Beagle_Works_Draw.xcu | 29 --
filter/source/config/fragments/filters/ClarisDraw.xcu | 30 ---
filter/source/config/fragments/filters/DocMaker.xcu | 30 ---
filter/source/config/fragments/filters/FullWrite_Professional.xcu | 30 ---
filter/source/config/fragments/filters/Great_Works.xcu | 29 --
filter/source/config/fragments/filters/Great_Works_Calc.xcu | 29 --
filter/source/config/fragments/filters/Great_Works_Draw.xcu | 29 --
filter/source/config/fragments/filters/HanMac_Word_J.xcu | 30 ---
filter/source/config/fragments/filters/HanMac_Word_K.xcu | 30 ---
filter/source/config/fragments/filters/LightWayText.xcu | 30 ---
filter/source/config/fragments/filters/MWAW_Bitmap.xcu | 29 ++
filter/source/config/fragments/filters/MWAW_Database.xcu | 29 ++
filter/source/config/fragments/filters/MWAW_Drawing.xcu | 29 ++
filter/source/config/fragments/filters/MWAW_Presentation.xcu | 29 ++
filter/source/config/fragments/filters/MWAW_Spreadsheet.xcu | 29 ++
filter/source/config/fragments/filters/MWAW_Text_Document.xcu | 29 ++
filter/source/config/fragments/filters/MacDoc.xcu | 29 --
filter/source/config/fragments/filters/MacDraft.xcu | 30 ---
filter/source/config/fragments/filters/MacDrawPro_Draw.xcu | 30 ---
filter/source/config/fragments/filters/MacDraw_Draw.xcu | 30 ---
filter/source/config/fragments/filters/MacPaint_Draw.xcu | 30 ---
filter/source/config/fragments/filters/MacWritePro.xcu | 30 ---
filter/source/config/fragments/filters/Mac_Acta.xcu | 29 --
filter/source/config/fragments/filters/Mac_More.xcu | 29 --
filter/source/config/fragments/filters/Mac_RagTime.xcu | 29 --
filter/source/config/fragments/filters/Mac_Wingz_Calc.xcu | 30 ---
filter/source/config/fragments/filters/Mac_Works_Draw.xcu | 30 ---
filter/source/config/fragments/filters/MindWrite.xcu | 30 ---
filter/source/config/fragments/filters/Nisus_Writer.xcu | 30 ---
filter/source/config/fragments/filters/Palm_Text_Document.xcu | 29 ++
filter/source/config/fragments/filters/SuperPaint_Draw.xcu | 30 ---
filter/source/config/fragments/filters/TeachText.xcu | 30 ---
filter/source/config/fragments/filters/TealDoc.xcu | 29 --
filter/source/config/fragments/filters/TexEdit.xcu | 30 ---
filter/source/config/fragments/filters/WriterPlus.xcu | 30 ---
filter/source/config/fragments/filters/ZWrite.xcu | 30 ---
filter/source/config/fragments/filters/eDoc_Document.xcu | 30 ---
filter/source/config/fragments/filters/eReader_eBook.xcu | 29 --
filter/source/config/fragments/filters/zTXT.xcu | 29 --
filter/source/config/fragments/types/MWAW_Bitmap.xcu | 27 ++
filter/source/config/fragments/types/MWAW_Database.xcu | 27 ++
filter/source/config/fragments/types/MWAW_Drawing.xcu | 27 ++
filter/source/config/fragments/types/MWAW_Presentation.xcu | 27 ++
filter/source/config/fragments/types/MWAW_Spreadsheet.xcu | 27 ++
filter/source/config/fragments/types/MWAW_Text_Document.xcu | 27 ++
filter/source/config/fragments/types/Palm_Text_Document.xcu | 29 ++
filter/source/config/fragments/types/calc_Beagle_Works.xcu | 29 --
filter/source/config/fragments/types/calc_Great_Works.xcu | 29 --
filter/source/config/fragments/types/calc_Mac_Wingz.xcu | 29 --
filter/source/config/fragments/types/draw_Beagle_Works.xcu | 29 --
filter/source/config/fragments/types/draw_ClarisDraw.xcu | 29 --
filter/source/config/fragments/types/draw_Great_Works.xcu | 29 --
filter/source/config/fragments/types/draw_MacDraft.xcu | 29 --
filter/source/config/fragments/types/draw_MacDraw.xcu | 29 --
filter/source/config/fragments/types/draw_MacDrawPro.xcu | 29 --
filter/source/config/fragments/types/draw_MacPaint.xcu | 29 --
filter/source/config/fragments/types/draw_Mac_Works.xcu | 29 --
filter/source/config/fragments/types/draw_SuperPaint.xcu | 29 --
filter/source/config/fragments/types/writer_Beagle_Works.xcu | 29 --
filter/source/config/fragments/types/writer_DocMaker.xcu | 29 --
filter/source/config/fragments/types/writer_FullWrite_Professional.xcu | 29 --
filter/source/config/fragments/types/writer_Great_Works.xcu | 29 --
filter/source/config/fragments/types/writer_HanMac_Word_J.xcu | 29 --
filter/source/config/fragments/types/writer_HanMac_Word_K.xcu | 29 --
filter/source/config/fragments/types/writer_LightWayText.xcu | 29 --
filter/source/config/fragments/types/writer_MacDoc.xcu | 29 --
filter/source/config/fragments/types/writer_MacWritePro.xcu | 29 --
filter/source/config/fragments/types/writer_Mac_Acta.xcu | 29 --
filter/source/config/fragments/types/writer_Mac_More.xcu | 29 --
filter/source/config/fragments/types/writer_Mac_RagTime.xcu | 29 --
filter/source/config/fragments/types/writer_MindWrite.xcu | 29 --
filter/source/config/fragments/types/writer_Nisus_Writer.xcu | 29 --
filter/source/config/fragments/types/writer_TeachText.xcu | 29 --
filter/source/config/fragments/types/writer_TealDoc.xcu | 29 --
filter/source/config/fragments/types/writer_TexEdit.xcu | 29 --
filter/source/config/fragments/types/writer_WriterPlus.xcu | 29 --
filter/source/config/fragments/types/writer_ZWrite.xcu | 29 --
filter/source/config/fragments/types/writer_eDoc_Document.xcu | 29 --
filter/source/config/fragments/types/writer_eReader_eBook.xcu | 29 --
filter/source/config/fragments/types/writer_zTXT.xcu | 29 --
writerperfect/source/calc/MWAWCalcImportFilter.cxx | 86 +-------
writerperfect/source/draw/MWAWDrawImportFilter.cxx | 96 +--------
writerperfect/source/impress/MWAWPresentationImportFilter.cxx | 65 ------
writerperfect/source/writer/EBookImportFilter.cxx | 45 ++--
writerperfect/source/writer/MWAWImportFilter.cxx | 99 ----------
92 files changed, 474 insertions(+), 2405 deletions(-)
New commits:
commit e23259391817e9f6176834d70ccf425e30fa9f34
Author: David Tardon <dtardon at redhat.com>
Date: Tue Dec 8 16:25:23 2015 +0100
merge some Palm text format filters
Change-Id: I796ce84325549178d3eac572c363a8cbc9ae542f
(cherry picked from commit 8050b97aca3efbba6df31c53a64ead9c81d9d708)
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 575a77f..7591365 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
similarity index 82%
rename from filter/source/config/fragments/filters/TealDoc.xcu
rename to filter/source/config/fragments/filters/Palm_Text_Document.xcu
index e74c154..4747d35 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 efc86ba..0000000
--- 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 6e5de94..0000000
--- 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
similarity index 83%
rename from filter/source/config/fragments/types/writer_zTXT.xcu
rename to filter/source/config/fragments/types/Palm_Text_Document.xcu
index 95cbc08..e067f9f 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 26c13da..0000000
--- 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 e090872..0000000
--- 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>
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx
index 5301bdc..73a9fbe 100644
--- a/writerperfect/source/writer/EBookImportFilter.cxx
+++ b/writerperfect/source/writer/EBookImportFilter.cxx
@@ -28,30 +28,31 @@ using libebook::EBOOKDocument;
bool EBookImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, OdtGenerator &rGenerator, utl::MediaDescriptor &rDescriptor)
{
- EBOOKDocument::Type type = EBOOKDocument::TYPE_UNKNOWN;
-
rtl::OUString aFilterName;
rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] >>= aFilterName;
assert(!aFilterName.isEmpty());
- if (aFilterName == "BroadBand eBook")
- type = EBOOKDocument::TYPE_BBEB;
- if (aFilterName == "FictionBook 2")
- type = EBOOKDocument::TYPE_FICTIONBOOK2;
- else if (aFilterName == "PalmDoc")
- type = EBOOKDocument::TYPE_PALMDOC;
- else if (aFilterName == "Plucker eBook")
- type = EBOOKDocument::TYPE_PLUCKER;
- else if (aFilterName == "eReader eBook")
- type = EBOOKDocument::TYPE_PEANUTPRESS;
- else if (aFilterName == "TealDoc")
- type = EBOOKDocument::TYPE_TEALDOC;
- else if (aFilterName == "zTXT")
- type = EBOOKDocument::TYPE_ZTXT;
-
- if (EBOOKDocument::TYPE_UNKNOWN != type)
- return EBOOKDocument::RESULT_OK == EBOOKDocument::parse(&rInput, &rGenerator, type);
+ if (aFilterName == "Palm_Text_Document")
+ {
+ return EBOOKDocument::RESULT_OK == EBOOKDocument::parse(&rInput, &rGenerator);
+ }
+ else
+ {
+ EBOOKDocument::Type type = EBOOKDocument::TYPE_UNKNOWN;
+
+ if (aFilterName == "BroadBand eBook")
+ type = EBOOKDocument::TYPE_BBEB;
+ else if (aFilterName == "FictionBook 2")
+ type = EBOOKDocument::TYPE_FICTIONBOOK2;
+ else if (aFilterName == "PalmDoc")
+ type = EBOOKDocument::TYPE_PALMDOC;
+ else if (aFilterName == "Plucker eBook")
+ type = EBOOKDocument::TYPE_PLUCKER;
+
+ if (EBOOKDocument::TYPE_UNKNOWN != type)
+ return EBOOKDocument::RESULT_OK == EBOOKDocument::parse(&rInput, &rGenerator, type);
+ }
return false;
}
@@ -79,13 +80,9 @@ bool EBookImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUSt
rTypeName = "writer_Plucker_eBook";
break;
case EBOOKDocument::TYPE_PEANUTPRESS :
- rTypeName = "writer_eReader_eBook";
- break;
case EBOOKDocument::TYPE_TEALDOC :
- rTypeName = "writer_TealDoc";
- break;
case EBOOKDocument::TYPE_ZTXT :
- rTypeName = "writer_zTXT";
+ rTypeName = "Palm_Text_Document";
break;
default :
SAL_WARN_IF(type != EBOOKDocument::TYPE_UNKNOWN, "writerperfect", "EBookImportFilter::doDetectFormat: document type " << type << " detected, but ignored");
commit c4a842fcba5f0d4462fd643d5f7705ba9aef7c49
Author: David Tardon <dtardon at redhat.com>
Date: Tue Dec 8 16:10:40 2015 +0100
merge libmwaw format specs (writer)
(cherry picked from commit 6dd6bc42eaa0841f681782ae65c32cb5472d8a20)
Change-Id: Icf1e5e976e0c98b2ce8e2dd7a3b9c89a6be7d7c6
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index a0ad9c1..575a77f 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -324,32 +324,12 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
writer_WordPerfect_Document \
writer_MS_Works_Document \
writer_MS_Write \
- writer_Beagle_Works \
writer_ClarisWorks \
- writer_DocMaker \
- writer_eDoc_Document \
- writer_FullWrite_Professional \
- writer_Great_Works \
- writer_HanMac_Word_J \
- writer_HanMac_Word_K \
- writer_LightWayText \
- writer_Mac_Acta \
- writer_Mac_More \
- writer_Mac_RagTime \
writer_Mac_Word \
writer_Mac_Works \
- writer_MacDoc \
writer_MacWrite \
- writer_MacWritePro \
writer_Mariner_Write \
- writer_MindWrite \
- writer_MWStyle \
- writer_Nisus_Writer \
- writer_TeachText \
- writer_TexEdit \
writer_WriteNow \
- writer_WriterPlus \
- writer_ZWrite \
writer_AbiWord_Document \
writer_T602_Document \
writer_LotusWordPro_Document \
@@ -372,6 +352,7 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
writer_TealDoc \
writer_zTXT \
writer_ApplePages \
+ MWAW_Text_Document \
))
$(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,filter/source/config/fragments/filters,\
@@ -388,32 +369,12 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
WordPerfect \
MS_Works \
MS_Write \
- Beagle_Works \
ClarisWorks \
- DocMaker \
- eDoc_Document \
- FullWrite_Professional \
- Great_Works \
- HanMac_Word_J \
- HanMac_Word_K \
- LightWayText \
- Mac_Acta \
- Mac_More \
- Mac_RagTime \
Mac_Word \
Mac_Works \
- MacDoc \
MacWrite \
- MacWritePro \
Mariner_Write \
- MWStyle \
- MindWrite \
- Nisus_Writer \
- TeachText \
- TexEdit \
WriteNow \
- WriterPlus \
- ZWrite \
AbiWord \
T602Document \
LotusWordPro \
@@ -437,6 +398,7 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
TealDoc \
zTXT \
ApplePages \
+ MWAW_Text_Document \
))
# fcfg_web
diff --git a/filter/source/config/fragments/filters/Beagle_Works.xcu b/filter/source/config/fragments/filters/Beagle_Works.xcu
deleted file mode 100644
index 02c3bd1..0000000
--- a/filter/source/config/fragments/filters/Beagle_Works.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="Beagle_Works" oor:op="replace">
- <prop oor:name="Flags">
- <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
- </prop>
- <prop oor:name="FilterService">
- <value>com.sun.star.comp.Writer.MWAWImportFilter</value>
- </prop>
- <prop oor:name="UIName">
- <value xml:lang="en-US">BeagleWorks/WordPerfect Works v1 Text Document</value>
- </prop>
- <prop oor:name="FileFormatVersion">
- <value>0</value>
- </prop>
- <prop oor:name="Type">
- <value>writer_Beagle_Works</value>
- </prop>
- <prop oor:name="DocumentService">
- <value>com.sun.star.text.TextDocument</value>
- </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/DocMaker.xcu b/filter/source/config/fragments/filters/DocMaker.xcu
deleted file mode 100644
index df08124..0000000
--- a/filter/source/config/fragments/filters/DocMaker.xcu
+++ /dev/null
@@ -1,30 +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="DocMaker" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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="en-US">DOCMaker (v4) Document</value>
- </prop>
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_DocMaker</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/FullWrite_Professional.xcu b/filter/source/config/fragments/filters/FullWrite_Professional.xcu
deleted file mode 100644
index caf41eb..0000000
--- a/filter/source/config/fragments/filters/FullWrite_Professional.xcu
+++ /dev/null
@@ -1,30 +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="FullWrite_Professional" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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="en-US">FullWrite Professional Document</value>
- </prop>
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_FullWrite_Professional</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/HanMac_Word_J.xcu b/filter/source/config/fragments/filters/HanMac_Word_J.xcu
deleted file mode 100644
index f19292a..0000000
--- a/filter/source/config/fragments/filters/HanMac_Word_J.xcu
+++ /dev/null
@@ -1,30 +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="HanMac_Word_J" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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="en-US">HanMac Word-J Document</value>
- </prop>
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_HanMac_Word_J</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/HanMac_Word_K.xcu b/filter/source/config/fragments/filters/HanMac_Word_K.xcu
deleted file mode 100644
index b373e7b..0000000
--- a/filter/source/config/fragments/filters/HanMac_Word_K.xcu
+++ /dev/null
@@ -1,30 +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="HanMac_Word_K" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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="en-US">HanMac Word-K Document</value>
- </prop>
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_HanMac_Word_K</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/LightWayText.xcu b/filter/source/config/fragments/filters/LightWayText.xcu
deleted file mode 100644
index 65b1ef6..0000000
--- a/filter/source/config/fragments/filters/LightWayText.xcu
+++ /dev/null
@@ -1,30 +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="LightWayText" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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="en-US">LightWayText for Mac v4.5</value>
- </prop>
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_LightWayText</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/Great_Works.xcu b/filter/source/config/fragments/filters/MWAW_Text_Document.xcu
similarity index 82%
rename from filter/source/config/fragments/filters/Great_Works.xcu
rename to filter/source/config/fragments/filters/MWAW_Text_Document.xcu
index f291d39..f030fb7 100644
--- a/filter/source/config/fragments/filters/Great_Works.xcu
+++ b/filter/source/config/fragments/filters/MWAW_Text_Document.xcu
@@ -7,7 +7,7 @@
*
-->
-<node oor:name="Great_Works" oor:op="replace">
+<node oor:name="MWAW_Text_Document" oor:op="replace">
<prop oor:name="Flags">
<value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
</prop>
@@ -15,13 +15,13 @@
<value>com.sun.star.comp.Writer.MWAWImportFilter</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">GreatWorks Text Document</value>
+ <value xml:lang="en-US">Legacy Mac Text Document</value>
</prop>
<prop oor:name="FileFormatVersion">
<value>0</value>
</prop>
<prop oor:name="Type">
- <value>writer_Great_Works</value>
+ <value>MWAW_Text_Document</value>
</prop>
<prop oor:name="DocumentService">
<value>com.sun.star.text.TextDocument</value>
diff --git a/filter/source/config/fragments/filters/MWStyle.xcu b/filter/source/config/fragments/filters/MWStyle.xcu
deleted file mode 100644
index 0a6e210..0000000
--- a/filter/source/config/fragments/filters/MWStyle.xcu
+++ /dev/null
@@ -1,30 +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="MWStyle" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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="en-US">Style</value>
- </prop>
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_MWStyle</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/MacDoc.xcu b/filter/source/config/fragments/filters/MacDoc.xcu
deleted file mode 100644
index 035437b..0000000
--- a/filter/source/config/fragments/filters/MacDoc.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="MacDoc" oor:op="replace">
- <prop oor:name="Flags">
- <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
- </prop>
- <prop oor:name="FilterService">
- <value>com.sun.star.comp.Writer.MWAWImportFilter</value>
- </prop>
- <prop oor:name="UIName">
- <value xml:lang="en-US">MacDoc v1 Document</value>
- </prop>
- <prop oor:name="FileFormatVersion">
- <value>0</value>
- </prop>
- <prop oor:name="Type">
- <value>writer_MacDoc</value>
- </prop>
- <prop oor:name="DocumentService">
- <value>com.sun.star.text.TextDocument</value>
- </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/MacWritePro.xcu b/filter/source/config/fragments/filters/MacWritePro.xcu
deleted file mode 100644
index dabedac..0000000
--- a/filter/source/config/fragments/filters/MacWritePro.xcu
+++ /dev/null
@@ -1,30 +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="MacWritePro" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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="en-US">MacWriteII or MacWritePro Document</value>
- </prop>
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_MacWritePro</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/Mac_Acta.xcu b/filter/source/config/fragments/filters/Mac_Acta.xcu
deleted file mode 100644
index dc5a115..0000000
--- a/filter/source/config/fragments/filters/Mac_Acta.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="Mac_Acta" oor:op="replace">
- <prop oor:name="Flags">
- <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
- </prop>
- <prop oor:name="FilterService">
- <value>com.sun.star.comp.Writer.MWAWImportFilter</value>
- </prop>
- <prop oor:name="UIName">
- <value xml:lang="en-US">Acta Mac Classic Document</value>
- </prop>
- <prop oor:name="FileFormatVersion">
- <value>0</value>
- </prop>
- <prop oor:name="Type">
- <value>writer_Mac_Acta</value>
- </prop>
- <prop oor:name="DocumentService">
- <value>com.sun.star.text.TextDocument</value>
- </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/Mac_More.xcu b/filter/source/config/fragments/filters/Mac_More.xcu
deleted file mode 100644
index a7149c6..0000000
--- a/filter/source/config/fragments/filters/Mac_More.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="Mac_More" oor:op="replace">
- <prop oor:name="Flags">
- <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
- </prop>
- <prop oor:name="FilterService">
- <value>com.sun.star.comp.Writer.MWAWImportFilter</value>
- </prop>
- <prop oor:name="UIName">
- <value xml:lang="en-US">More Mac v2-3 Document</value>
- </prop>
- <prop oor:name="FileFormatVersion">
- <value>0</value>
- </prop>
- <prop oor:name="Type">
- <value>writer_Mac_More</value>
- </prop>
- <prop oor:name="DocumentService">
- <value>com.sun.star.text.TextDocument</value>
- </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/Mac_RagTime.xcu b/filter/source/config/fragments/filters/Mac_RagTime.xcu
deleted file mode 100644
index 6344292..0000000
--- a/filter/source/config/fragments/filters/Mac_RagTime.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="Mac_RagTime" oor:op="replace">
- <prop oor:name="Flags">
- <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
- </prop>
- <prop oor:name="FilterService">
- <value>com.sun.star.comp.Writer.MWAWImportFilter</value>
- </prop>
- <prop oor:name="UIName">
- <value xml:lang="en-US">RagTime Mac v2-5 Document</value>
- </prop>
- <prop oor:name="FileFormatVersion">
- <value>0</value>
- </prop>
- <prop oor:name="Type">
- <value>writer_Mac_RagTime</value>
- </prop>
- <prop oor:name="DocumentService">
- <value>com.sun.star.text.TextDocument</value>
- </prop>
-</node>
diff --git a/filter/source/config/fragments/filters/MindWrite.xcu b/filter/source/config/fragments/filters/MindWrite.xcu
deleted file mode 100644
index 4d7395e..0000000
--- a/filter/source/config/fragments/filters/MindWrite.xcu
+++ /dev/null
@@ -1,30 +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="MindWrite" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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="en-US">MindWrite Document</value>
- </prop>
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_MindWrite</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/Nisus_Writer.xcu b/filter/source/config/fragments/filters/Nisus_Writer.xcu
deleted file mode 100644
index f7b0746..0000000
--- a/filter/source/config/fragments/filters/Nisus_Writer.xcu
+++ /dev/null
@@ -1,30 +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="Nisus_Writer" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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="en-US">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>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/TeachText.xcu b/filter/source/config/fragments/filters/TeachText.xcu
deleted file mode 100644
index 0e978e7..0000000
--- a/filter/source/config/fragments/filters/TeachText.xcu
+++ /dev/null
@@ -1,30 +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="TeachText" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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="en-US">TeachText/SimpleText v1 Document</value>
- </prop>
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_TeachText</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/TexEdit.xcu b/filter/source/config/fragments/filters/TexEdit.xcu
deleted file mode 100644
index 844c47b..0000000
--- a/filter/source/config/fragments/filters/TexEdit.xcu
+++ /dev/null
@@ -1,30 +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="TexEdit" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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="en-US">Tex-Edit 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>
diff --git a/filter/source/config/fragments/filters/WriterPlus.xcu b/filter/source/config/fragments/filters/WriterPlus.xcu
deleted file mode 100644
index 65599ec..0000000
--- a/filter/source/config/fragments/filters/WriterPlus.xcu
+++ /dev/null
@@ -1,30 +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="WriterPlus" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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="en-US">WriterPlus Document</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>
diff --git a/filter/source/config/fragments/filters/ZWrite.xcu b/filter/source/config/fragments/filters/ZWrite.xcu
deleted file mode 100644
index c91d557..0000000
--- a/filter/source/config/fragments/filters/ZWrite.xcu
+++ /dev/null
@@ -1,30 +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="ZWrite" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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" />
- <prop oor:name="UIName">
- <value xml:lang="en-US">Z-Write 1.3 Document</value>
- </prop>
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_ZWrite</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/eDoc_Document.xcu b/filter/source/config/fragments/filters/eDoc_Document.xcu
deleted file mode 100644
index bdc3209..0000000
--- a/filter/source/config/fragments/filters/eDoc_Document.xcu
+++ /dev/null
@@ -1,30 +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="eDoc_Document" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 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="en-US">eDOC (v2) Document</value>
- </prop>
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>writer_eDoc_Document</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/types/writer_MacDoc.xcu b/filter/source/config/fragments/types/MWAW_Text_Document.xcu
similarity index 74%
rename from filter/source/config/fragments/types/writer_MacDoc.xcu
rename to filter/source/config/fragments/types/MWAW_Text_Document.xcu
index 172215b..6e2b1cd 100644
--- a/filter/source/config/fragments/types/writer_MacDoc.xcu
+++ b/filter/source/config/fragments/types/MWAW_Text_Document.xcu
@@ -7,23 +7,21 @@
*
-->
-<node oor:name="writer_MacDoc" oor:op="replace">
+<node oor:name="MWAW_Text_Document" oor:op="replace">
<prop oor:name="DetectService">
<value>com.sun.star.comp.Writer.MWAWImportFilter</value>
</prop>
<prop oor:name="Extensions">
- <value>hqx zip</value>
- </prop>
- <prop oor:name="MediaType">
- <value></value>
+ <value>*</value>
</prop>
+ <prop oor:name="MediaType"/>
<prop oor:name="Preferred">
<value>true</value>
</prop>
<prop oor:name="PreferredFilter">
- <value>MacDoc</value>
+ <value>MWAW_Text_Document</value>
</prop>
<prop oor:name="UIName">
- <value>MacDoc</value>
+ <value>Legacy Mac Text Document</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/types/writer_Beagle_Works.xcu b/filter/source/config/fragments/types/writer_Beagle_Works.xcu
deleted file mode 100644
index 5eb45c1..0000000
--- a/filter/source/config/fragments/types/writer_Beagle_Works.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_Beagle_Works" oor:op="replace">
- <prop oor:name="DetectService">
- <value>com.sun.star.comp.Writer.MWAWImportFilter</value>
- </prop>
- <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">
- <value>Beagle_Works</value>
- </prop>
- <prop oor:name="UIName">
- <value>BeagleWorks/WordPerfect Works Document</value>
- </prop>
-</node>
diff --git a/filter/source/config/fragments/types/writer_DocMaker.xcu b/filter/source/config/fragments/types/writer_DocMaker.xcu
deleted file mode 100644
index c8f8e88..0000000
--- a/filter/source/config/fragments/types/writer_DocMaker.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/.
- *
- * 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="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>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>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
diff --git a/filter/source/config/fragments/types/writer_FullWrite_Professional.xcu b/filter/source/config/fragments/types/writer_FullWrite_Professional.xcu
deleted file mode 100644
index a4953ae..0000000
--- a/filter/source/config/fragments/types/writer_FullWrite_Professional.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/.
- *
- * 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="writer_FullWrite_Professional" 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="MediaType"><value></value></prop>
- <prop oor:name="Preferred"><value>true</value></prop>
- <prop oor:name="PreferredFilter"><value>FullWrite_Professional</value></prop>
- <prop oor:name="UIName">
- <value>FullWrite Professional Document</value>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
diff --git a/filter/source/config/fragments/types/writer_Great_Works.xcu b/filter/source/config/fragments/types/writer_Great_Works.xcu
deleted file mode 100644
index 6c448f3..0000000
--- a/filter/source/config/fragments/types/writer_Great_Works.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_Great_Works" oor:op="replace">
- <prop oor:name="DetectService">
- <value>com.sun.star.comp.Writer.MWAWImportFilter</value>
- </prop>
- <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">
- <value>Great_Works</value>
- </prop>
- <prop oor:name="UIName">
- <value>GreatWorks Document</value>
- </prop>
-</node>
diff --git a/filter/source/config/fragments/types/writer_HanMac_Word_J.xcu b/filter/source/config/fragments/types/writer_HanMac_Word_J.xcu
deleted file mode 100644
index 3df4083..0000000
--- a/filter/source/config/fragments/types/writer_HanMac_Word_J.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/.
- *
- * 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="writer_HanMac_Word_J" 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="MediaType"><value></value></prop>
- <prop oor:name="Preferred"><value>true</value></prop>
- <prop oor:name="PreferredFilter"><value>HanMac_Word_J</value></prop>
- <prop oor:name="UIName">
- <value>HanMac Word-J Document</value>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
diff --git a/filter/source/config/fragments/types/writer_HanMac_Word_K.xcu b/filter/source/config/fragments/types/writer_HanMac_Word_K.xcu
deleted file mode 100644
index b0c74cf..0000000
--- a/filter/source/config/fragments/types/writer_HanMac_Word_K.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/.
- *
- * 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="writer_HanMac_Word_K" 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="MediaType"><value></value></prop>
- <prop oor:name="Preferred"><value>true</value></prop>
- <prop oor:name="PreferredFilter">HanMac_Word_K<value></value></prop>
- <prop oor:name="UIName">
- <value>HanMac Word-K 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
deleted file mode 100644
index bf28d07..0000000
--- a/filter/source/config/fragments/types/writer_LightWayText.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/.
- *
- * 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="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>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>
- <prop oor:name="UIName">
- <value>LightWayText for Mac v4.5</value>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
diff --git a/filter/source/config/fragments/types/writer_MWStyle.xcu b/filter/source/config/fragments/types/writer_MWStyle.xcu
deleted file mode 100644
index 548076e..0000000
--- a/filter/source/config/fragments/types/writer_MWStyle.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/.
- *
- * 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="writer_MWStyle" 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="MediaType"></prop>
- <prop oor:name="Preferred"><value>true</value></prop>
- <prop oor:name="PreferredFilter"><value>Style (v1)</value></prop>
- <prop oor:name="UIName">
- <value>Style v1 Document</value>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
diff --git a/filter/source/config/fragments/types/writer_MacWritePro.xcu b/filter/source/config/fragments/types/writer_MacWritePro.xcu
deleted file mode 100644
index 821f0e1..0000000
--- a/filter/source/config/fragments/types/writer_MacWritePro.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/.
- *
- * 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="writer_MacWritePro" 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>mw mcw</value></prop>
- <prop oor:name="MediaType"><value>application/macwriteii</value></prop>
- <prop oor:name="Preferred"><value>true</value></prop>
- <prop oor:name="PreferredFilter"><value>MacWritePro</value></prop>
- <prop oor:name="UIName">
- <value>MacWriteII or MacWritePro Document</value>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
diff --git a/filter/source/config/fragments/types/writer_Mac_Acta.xcu b/filter/source/config/fragments/types/writer_Mac_Acta.xcu
deleted file mode 100644
index 478add2..0000000
--- a/filter/source/config/fragments/types/writer_Mac_Acta.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_Mac_Acta" oor:op="replace">
- <prop oor:name="DetectService">
- <value>com.sun.star.comp.Writer.MWAWImportFilter</value>
- </prop>
- <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">
- <value>Mac_Acta</value>
- </prop>
- <prop oor:name="UIName">
- <value>Acta Mac v1-2 Document</value>
- </prop>
-</node>
diff --git a/filter/source/config/fragments/types/writer_Mac_More.xcu b/filter/source/config/fragments/types/writer_Mac_More.xcu
deleted file mode 100644
index 66047d5..0000000
--- a/filter/source/config/fragments/types/writer_Mac_More.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_Mac_More" oor:op="replace">
- <prop oor:name="DetectService">
- <value>com.sun.star.comp.Writer.MWAWImportFilter</value>
- </prop>
- <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">
- <value>Mac_More</value>
- </prop>
- <prop oor:name="UIName">
- <value>More Mac v2-3 Document</value>
- </prop>
-</node>
diff --git a/filter/source/config/fragments/types/writer_Mac_RagTime.xcu b/filter/source/config/fragments/types/writer_Mac_RagTime.xcu
deleted file mode 100644
index 81dc022..0000000
--- a/filter/source/config/fragments/types/writer_Mac_RagTime.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_Mac_RagTime" oor:op="replace">
- <prop oor:name="DetectService">
- <value>com.sun.star.comp.Writer.MWAWImportFilter</value>
- </prop>
- <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">
- <value>Mac_RagTime</value>
- </prop>
- <prop oor:name="UIName">
- <value>RagTime Mac v2-3 Document</value>
- </prop>
-</node>
diff --git a/filter/source/config/fragments/types/writer_MindWrite.xcu b/filter/source/config/fragments/types/writer_MindWrite.xcu
deleted file mode 100644
index 9b6c4bb..0000000
--- a/filter/source/config/fragments/types/writer_MindWrite.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/.
- *
- * 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="writer_MindWrite" 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="MediaType"><value></value></prop>
- <prop oor:name="Preferred"><value>true</value></prop>
- <prop oor:name="PreferredFilter">MindWrite<value></value></prop>
- <prop oor:name="UIName">
- <value>MindWrite Document</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
deleted file mode 100644
index 490fd05..0000000
--- a/filter/source/config/fragments/types/writer_Nisus_Writer.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/.
- *
- * 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="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>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 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
deleted file mode 100644
index 073ad05..0000000
--- a/filter/source/config/fragments/types/writer_TeachText.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/.
- *
- * 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="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>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>
- <prop oor:name="UIName">
- <value>TeachText/SimpleText v1 Document</value>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
diff --git a/filter/source/config/fragments/types/writer_TexEdit.xcu b/filter/source/config/fragments/types/writer_TexEdit.xcu
deleted file mode 100644
index 9ffd87f..0000000
--- a/filter/source/config/fragments/types/writer_TexEdit.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/.
- *
- * 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="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>hqx zip</value></prop>
- <prop oor:name="MediaType"><value></value></prop>
- <prop oor:name="Preferred"><value>true</value></prop>
- <prop oor:name="PreferredFilter"><value>TexEdit</value></prop>
- <prop oor:name="UIName">
- <value>Tex-Edit v2 Document</value>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
diff --git a/filter/source/config/fragments/types/writer_WriterPlus.xcu b/filter/source/config/fragments/types/writer_WriterPlus.xcu
deleted file mode 100644
index 934ae12..0000000
--- a/filter/source/config/fragments/types/writer_WriterPlus.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/.
- *
- * 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="writer_WriterPlus" 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="MediaType"><value></value></prop>
- <prop oor:name="Preferred"><value>true</value></prop>
- <prop oor:name="PreferredFilter"><value>WriterPlus</value></prop>
- <prop oor:name="UIName">
- <value>Writer Plus Document</value>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
diff --git a/filter/source/config/fragments/types/writer_ZWrite.xcu b/filter/source/config/fragments/types/writer_ZWrite.xcu
deleted file mode 100644
index eeebe3f..0000000
--- a/filter/source/config/fragments/types/writer_ZWrite.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/.
- *
- * 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="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>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>
- <prop oor:name="UIName">
- <value>Z-Write 1.3 Document</value>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
diff --git a/filter/source/config/fragments/types/writer_eDoc_Document.xcu b/filter/source/config/fragments/types/writer_eDoc_Document.xcu
deleted file mode 100644
index 26b1abe..0000000
--- a/filter/source/config/fragments/types/writer_eDoc_Document.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/.
- *
- * 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="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>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>
- </prop>
- <prop oor:name="ClipboardFormat"/>
- </node>
diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx
index 214efcc..ee4e78b 100644
--- a/writerperfect/source/writer/MWAWImportFilter.cxx
+++ b/writerperfect/source/writer/MWAWImportFilter.cxx
@@ -58,44 +58,12 @@ bool MWAWImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUStr
{
switch (docType)
{
- case MWAWDocument::MWAW_T_ACTA:
- rTypeName = "writer_Mac_Acta";
- break;
- case MWAWDocument::MWAW_T_BEAGLEWORKS:
- rTypeName = "writer_Beagle_Works";
- break;
case MWAWDocument::MWAW_T_CLARISWORKS:
rTypeName = "writer_ClarisWorks";
break;
- case MWAWDocument::MWAW_T_DOCMAKER:
- rTypeName = "writer_DocMaker";
- break;
- case MWAWDocument::MWAW_T_EDOC:
- rTypeName = "writer_eDoc_Document";
- break;
- case MWAWDocument::MWAW_T_FULLWRITE:
- rTypeName = "writer_FullWrite_Professional";
- break;
- case MWAWDocument::MWAW_T_GREATWORKS:
- rTypeName = "writer_Great_Works";
- break;
- case MWAWDocument::MWAW_T_HANMACWORDJ:
- rTypeName = "writer_HanMac_Word_J";
- break;
- case MWAWDocument::MWAW_T_HANMACWORDK:
- rTypeName = "writer_HanMac_Word_K";
- break;
- case MWAWDocument::MWAW_T_LIGHTWAYTEXT:
- rTypeName = "writer_LightWayText";
- break;
- case MWAWDocument::MWAW_T_MACDOC:
- rTypeName = "writer_MacDoc";
- break;
case MWAWDocument::MWAW_T_MACWRITE:
- rTypeName = "writer_MacWrite";
- break;
case MWAWDocument::MWAW_T_MACWRITEPRO:
- rTypeName = "writer_MacWritePro";
+ rTypeName = "writer_MacWrite";
break;
case MWAWDocument::MWAW_T_MARINERWRITE:
rTypeName = "writer_Mariner_Write";
@@ -106,75 +74,11 @@ bool MWAWImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUStr
case MWAWDocument::MWAW_T_MICROSOFTWORKS:
rTypeName = "writer_Mac_Works";
break;
- case MWAWDocument::MWAW_T_MINDWRITE:
- rTypeName = "writer_MindWrite";
- break;
- case MWAWDocument::MWAW_T_MORE:
- rTypeName = "writer_Mac_More";
- break;
- case MWAWDocument::MWAW_T_NISUSWRITER:
- rTypeName = "writer_Nisus_Writer";
- break;
- case MWAWDocument::MWAW_T_RAGTIME:
- rTypeName = "writer_Mac_RagTime";
- break;
- case MWAWDocument::MWAW_T_TEACHTEXT:
- rTypeName = "writer_TeachText";
- break;
- case MWAWDocument::MWAW_T_TEXEDIT:
- rTypeName = "writer_TexEdit";
- break;
case MWAWDocument::MWAW_T_WRITENOW:
rTypeName = "writer_WriteNow";
break;
- case MWAWDocument::MWAW_T_WRITERPLUS:
- rTypeName = "writer_WriterPlus";
- break;
- case MWAWDocument::MWAW_T_ZWRITE:
- rTypeName = "writer_ZWrite";
- break;
- case MWAWDocument::MWAW_T_RESERVED3: // also MWAWDocument::MWAW_T_STYLE
- rTypeName = "writer_MWStyle";
- break;
-
- case MWAWDocument::MWAW_T_ADOBEILLUSTRATOR:
- case MWAWDocument::MWAW_T_CLARISRESOLVE:
- case MWAWDocument::MWAW_T_DBASE:
- case MWAWDocument::MWAW_T_FAMILYTREEMAKER:
- case MWAWDocument::MWAW_T_FILEMAKER:
- case MWAWDocument::MWAW_T_FOXBASE:
- case MWAWDocument::MWAW_T_FULLIMPACT:
- case MWAWDocument::MWAW_T_FULLPAINT:
- case MWAWDocument::MWAW_T_FRAMEMAKER:
- case MWAWDocument::MWAW_T_INFOGENIE:
- case MWAWDocument::MWAW_T_KALEIDAGRAPH:
- case MWAWDocument::MWAW_T_MACDRAFT:
- case MWAWDocument::MWAW_T_MACDRAW:
- case MWAWDocument::MWAW_T_MACDRAWPRO:
- case MWAWDocument::MWAW_T_MACPAINT:
- case MWAWDocument::MWAW_T_MICROSOFTFILE:
- case MWAWDocument::MWAW_T_MICROSOFTMULTIPLAN:
- case MWAWDocument::MWAW_T_OVERVUE:
- case MWAWDocument::MWAW_T_PAGEMAKER:
- case MWAWDocument::MWAW_T_PIXELPAINT:
- case MWAWDocument::MWAW_T_READYSETGO:
- case MWAWDocument::MWAW_T_SUPERPAINT:
- case MWAWDocument::MWAW_T_SYMPOSIUM:
- case MWAWDocument::MWAW_T_TRAPEZE:
- case MWAWDocument::MWAW_T_WINGZ:
- case MWAWDocument::MWAW_T_XPRESS:
- case MWAWDocument::MWAW_T_4DIMENSION:
-
- case MWAWDocument::MWAW_T_RESERVED1:
- case MWAWDocument::MWAW_T_RESERVED2:
- case MWAWDocument::MWAW_T_RESERVED4:
- case MWAWDocument::MWAW_T_RESERVED5:
- case MWAWDocument::MWAW_T_RESERVED6:
- case MWAWDocument::MWAW_T_RESERVED7:
- case MWAWDocument::MWAW_T_RESERVED8:
- case MWAWDocument::MWAW_T_RESERVED9:
- case MWAWDocument::MWAW_T_UNKNOWN:
default:
+ rTypeName = "MWAW_Text_Document";
break;
}
}
commit a6ddadc711374e883d57fee7e68ba26074ea9c53
Author: David Tardon <dtardon at redhat.com>
Date: Tue Dec 8 15:48:08 2015 +0100
add generic presentation filter for libmwaw
Change-Id: I3b96671b7a0f278329a686ba9082b3e4e4989e87
(cherry picked from commit 511d16718590d12bf25be03c630eea7c3159d008)
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 81d00f1..a0ad9c1 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -630,6 +630,7 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_impress_types.xc
impress_OOXML_Presentation_Template \
impress_OOXML_Presentation_AutoPlay \
impress_ClarisWorks \
+ MWAW_Presentation \
))
$(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impress_filters.xcu,filter/source/config/fragments/filters,\
@@ -653,6 +654,7 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impress_filter
impress_OOXML_Template \
impress_OOXML_AutoPlay \
ClarisWorks_Impress \
+ MWAW_Presentation \
))
# fcfg_chart
diff --git a/filter/source/config/fragments/filters/MWAW_Presentation.xcu b/filter/source/config/fragments/filters/MWAW_Presentation.xcu
new file mode 100644
index 0000000..8cfa944
--- /dev/null
+++ b/filter/source/config/fragments/filters/MWAW_Presentation.xcu
@@ -0,0 +1,29 @@
+<!--
+ * 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="MWAW_Presentation" oor:op="replace">
+ <prop oor:name="Flags">
+ <value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
+ </prop>
+ <prop oor:name="FilterService">
+ <value>com.sun.star.comp.Impress.MWAWPresentationImportFilter</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">Legacy Mac Presentation</value>
+ </prop>
+ <prop oor:name="FileFormatVersion">
+ <value>0</value>
+ </prop>
+ <prop oor:name="Type">
+ <value>MWAW_Presentation</value>
+ </prop>
+ <prop oor:name="DocumentService">
+ <value>com.sun.star.presentation.PresentationDocument</value>
+ </prop>
+</node>
diff --git a/filter/source/config/fragments/types/MWAW_Presentation.xcu b/filter/source/config/fragments/types/MWAW_Presentation.xcu
new file mode 100644
index 0000000..2f96bff
--- /dev/null
+++ b/filter/source/config/fragments/types/MWAW_Presentation.xcu
@@ -0,0 +1,27 @@
+<!--
+ * 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="MWAW_Presentation" oor:op="replace">
+ <prop oor:name="DetectService">
+ <value>com.sun.star.comp.Impress.MWAWImpressImportFilter</value>
+ </prop>
+ <prop oor:name="Extensions">
+ <value>*</value>
+ </prop>
+ <prop oor:name="MediaType"/>
+ <prop oor:name="Preferred">
+ <value>true</value>
+ </prop>
+ <prop oor:name="PreferredFilter">
+ <value>MWAW_Presentation</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value>Legacy Mac Presentation</value>
+ </prop>
+</node>
diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
index 2a7afd2..68c9b3b 100644
--- a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
+++ b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
@@ -62,70 +62,8 @@ bool MWAWPresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream &r
case MWAWDocument::MWAW_T_CLARISWORKS:
rTypeName = "impress_ClarisWorks";
break;
-
- case MWAWDocument::MWAW_T_ACTA:
- case MWAWDocument::MWAW_T_BEAGLEWORKS:
- case MWAWDocument::MWAW_T_ADOBEILLUSTRATOR:
- case MWAWDocument::MWAW_T_CLARISRESOLVE:
- case MWAWDocument::MWAW_T_DBASE:
- case MWAWDocument::MWAW_T_DOCMAKER:
- case MWAWDocument::MWAW_T_EDOC:
- case MWAWDocument::MWAW_T_FAMILYTREEMAKER:
- case MWAWDocument::MWAW_T_FILEMAKER:
- case MWAWDocument::MWAW_T_FOXBASE:
- case MWAWDocument::MWAW_T_FRAMEMAKER:
- case MWAWDocument::MWAW_T_FULLIMPACT:
- case MWAWDocument::MWAW_T_FULLPAINT:
- case MWAWDocument::MWAW_T_FULLWRITE:
- case MWAWDocument::MWAW_T_GREATWORKS:
- case MWAWDocument::MWAW_T_INFOGENIE:
- case MWAWDocument::MWAW_T_KALEIDAGRAPH:
- case MWAWDocument::MWAW_T_HANMACWORDJ:
- case MWAWDocument::MWAW_T_HANMACWORDK:
- case MWAWDocument::MWAW_T_LIGHTWAYTEXT:
- case MWAWDocument::MWAW_T_MACDOC:
- case MWAWDocument::MWAW_T_MACDRAFT:
- case MWAWDocument::MWAW_T_MACDRAW:
- case MWAWDocument::MWAW_T_MACDRAWPRO:
- case MWAWDocument::MWAW_T_MACPAINT:
- case MWAWDocument::MWAW_T_MACWRITE:
- case MWAWDocument::MWAW_T_MACWRITEPRO:
- case MWAWDocument::MWAW_T_MARINERWRITE:
- case MWAWDocument::MWAW_T_MINDWRITE:
- case MWAWDocument::MWAW_T_MICROSOFTFILE:
- case MWAWDocument::MWAW_T_MICROSOFTMULTIPLAN:
- case MWAWDocument::MWAW_T_MICROSOFTWORD:
- case MWAWDocument::MWAW_T_MICROSOFTWORKS:
- case MWAWDocument::MWAW_T_MORE:
- case MWAWDocument::MWAW_T_NISUSWRITER:
- case MWAWDocument::MWAW_T_OVERVUE:
- case MWAWDocument::MWAW_T_PAGEMAKER:
- case MWAWDocument::MWAW_T_PIXELPAINT:
- case MWAWDocument::MWAW_T_RAGTIME:
- case MWAWDocument::MWAW_T_READYSETGO:
- case MWAWDocument::MWAW_T_SUPERPAINT:
- case MWAWDocument::MWAW_T_SYMPOSIUM:
- case MWAWDocument::MWAW_T_TEACHTEXT:
- case MWAWDocument::MWAW_T_TEXEDIT:
- case MWAWDocument::MWAW_T_TRAPEZE:
- case MWAWDocument::MWAW_T_WINGZ:
- case MWAWDocument::MWAW_T_WRITENOW:
- case MWAWDocument::MWAW_T_WRITERPLUS:
- case MWAWDocument::MWAW_T_XPRESS:
- case MWAWDocument::MWAW_T_ZWRITE:
- case MWAWDocument::MWAW_T_4DIMENSION:
-
- case MWAWDocument::MWAW_T_RESERVED1:
- case MWAWDocument::MWAW_T_RESERVED2:
- case MWAWDocument::MWAW_T_RESERVED3:
- case MWAWDocument::MWAW_T_RESERVED4:
- case MWAWDocument::MWAW_T_RESERVED5:
- case MWAWDocument::MWAW_T_RESERVED6:
- case MWAWDocument::MWAW_T_RESERVED7:
- case MWAWDocument::MWAW_T_RESERVED8:
- case MWAWDocument::MWAW_T_RESERVED9:
- case MWAWDocument::MWAW_T_UNKNOWN:
default:
+ rTypeName = "MWAW_Presentation";
break;
}
}
commit b97d52a1481f91defad7fe769f72057cea0990b3
Author: David Tardon <dtardon at redhat.com>
Date: Tue Dec 8 14:42:30 2015 +0100
merge libmwaw format specs (draw)
Change-Id: Ia0dfe1e1ce1ab2b1ef266d1aa0950fd6670b0c50
(cherry picked from commit 83d30fdbcba0df628c9c6dd51a868e0fa32b0eef)
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index bb95d36..81d00f1 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -583,18 +583,10 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,f
draw_Corel_Presentation_Exchange \
draw_Freehand_Document \
draw_Visio_Document \
- draw_Beagle_Works \
- draw_ClarisDraw \
draw_ClarisWorks \
- draw_Great_Works \
- draw_MacDraft \
- draw_MacDraw \
- draw_MacDrawPro \
- draw_Mac_Works \
- draw_MacPaint \
- draw_PixelPaint \
- draw_SuperPaint \
draw_PageMaker_Document \
+ MWAW_Bitmap \
+ MWAW_Drawing \
))
$(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\
@@ -610,18 +602,10 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.x
CorelDrawDocument \
CorelPresentationExchange \
FreehandDocument \
- Beagle_Works_Draw \
- ClarisDraw \
ClarisWorks_Draw \
- Great_Works_Draw \
- MacDraft \
- MacDraw_Draw \
- MacDrawPro_Draw \
- Mac_Works_Draw \
- MacPaint_Draw \
- PixelPaint_Draw \
- SuperPaint_Draw \
PageMakerDocument \
+ MWAW_Bitmap \
+ MWAW_Drawing \
))
# fcfg_impress
diff --git a/filter/source/config/fragments/filters/ClarisDraw.xcu b/filter/source/config/fragments/filters/ClarisDraw.xcu
deleted file mode 100644
index deb250c..0000000
--- a/filter/source/config/fragments/filters/ClarisDraw.xcu
+++ /dev/null
@@ -1,30 +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="ClarisDraw" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop>
- <prop oor:name="UserData"><value></value></prop>
- <prop oor:name="UIName">
- <value xml:lang="en-US">ClarisDraw</value>
- </prop>
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>draw_ClarisDraw</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/Great_Works_Draw.xcu b/filter/source/config/fragments/filters/MWAW_Bitmap.xcu
similarity index 83%
rename from filter/source/config/fragments/filters/Great_Works_Draw.xcu
rename to filter/source/config/fragments/filters/MWAW_Bitmap.xcu
index 27ebf0e..034b721 100644
--- a/filter/source/config/fragments/filters/Great_Works_Draw.xcu
+++ b/filter/source/config/fragments/filters/MWAW_Bitmap.xcu
@@ -7,7 +7,7 @@
*
-->
-<node oor:name="Great_Works_Draw" oor:op="replace">
+<node oor:name="MWAW_Bitmap" oor:op="replace">
<prop oor:name="Flags">
<value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
</prop>
@@ -15,13 +15,13 @@
<value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">GreatWorks Drawing</value>
+ <value xml:lang="en-US">Legacy Mac Bitmap</value>
</prop>
<prop oor:name="FileFormatVersion">
<value>0</value>
</prop>
<prop oor:name="Type">
- <value>draw_Great_Works</value>
+ <value>MWAW_Bitmap</value>
</prop>
<prop oor:name="DocumentService">
<value>com.sun.star.drawing.DrawingDocument</value>
diff --git a/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu b/filter/source/config/fragments/filters/MWAW_Drawing.xcu
similarity index 81%
rename from filter/source/config/fragments/filters/Beagle_Works_Draw.xcu
rename to filter/source/config/fragments/filters/MWAW_Drawing.xcu
index 1cec0bb..b92f378 100644
--- a/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu
+++ b/filter/source/config/fragments/filters/MWAW_Drawing.xcu
@@ -7,7 +7,7 @@
*
-->
-<node oor:name="Beagle_Works_Draw" oor:op="replace">
+<node oor:name="MWAW_Drawing" oor:op="replace">
<prop oor:name="Flags">
<value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value>
</prop>
@@ -15,13 +15,13 @@
<value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">BeagleWorks/WordPerfect Works v1 Drawing</value>
+ <value xml:lang="en-US">Legacy Mac Drawing</value>
</prop>
<prop oor:name="FileFormatVersion">
<value>0</value>
</prop>
<prop oor:name="Type">
- <value>draw_Beagle_Works</value>
+ <value>MWAW_Drawing</value>
</prop>
<prop oor:name="DocumentService">
<value>com.sun.star.drawing.DrawingDocument</value>
diff --git a/filter/source/config/fragments/filters/MacDraft.xcu b/filter/source/config/fragments/filters/MacDraft.xcu
deleted file mode 100644
index 7a70498..0000000
--- a/filter/source/config/fragments/filters/MacDraft.xcu
+++ /dev/null
@@ -1,30 +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="MacDraft" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop>
- <prop oor:name="UserData"><value></value></prop>
- <prop oor:name="UIName">
- <value xml:lang="en-US">MacDraft</value>
- </prop>
- <prop oor:name="FileFormatVersion"><value>0</value></prop>
- <prop oor:name="Type"><value>draw_MacDraft</value></prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
- </node>
diff --git a/filter/source/config/fragments/filters/MacDrawPro_Draw.xcu b/filter/source/config/fragments/filters/MacDrawPro_Draw.xcu
deleted file mode 100644
index 633e6c0..0000000
--- a/filter/source/config/fragments/filters/MacDrawPro_Draw.xcu
+++ /dev/null
@@ -1,30 +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="MacDrawPro_Draw" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list