Update to last libmwaw version

+ add filters for MacDraw, MacDraw II and RagTime (v2-3 for Mac)

Change-Id: If84abff1baa75f9bfa951039781575b6a8648a84

download.lst

@@ -100,8 +100,8 @@ export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-
 export MDDS_TARBALL := 896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2
 export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11
 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2
-export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6
-export MWAW_TARBALL := libmwaw-0.3.1.tar.bz2
+export MWAW_MD5SUM := 19b879c2a27251db6fb274d6c585d488
+export MWAW_TARBALL := libmwaw-0.3.3.tar.bz2
 export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz

external/libmwaw/Library_mwaw.mk

@@ -12,8 +12,8 @@ $(eval $(call gb_Library_Library,mwaw))
 $(eval $(call gb_Library_use_unpacked,mwaw,libmwaw))
 
 $(eval $(call gb_Library_use_externals,mwaw,\
+    revenge \
     boost_headers \
-	revenge \
 ))
 
 $(eval $(call gb_Library_set_warnings_not_errors,mwaw))

external/libmwaw/UnpackedTarball_libmwaw.mk

@@ -13,12 +13,4 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
-	external/libmwaw/0001-librevenge-stream-is-optional-don-t-depend-on-it.patch \
-	external/libmwaw/0002-librevenge-stream-is-optional-don-t-depend-on-it.patch \
-	external/libmwaw/0001-msvc2013-does-not-like-this.patch \
-	external/libmwaw/0001-MWAWDocument.cxx-remove-an-useless-debug-message.patch \
-	external/libmwaw/ubsan.patch.0 \
-))
-
 # vim: set noet sw=4 ts=4:

filter/Configuration_filter.mk

@@ -335,6 +335,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
 	writer_LightWayText \
 	writer_Mac_Acta \
 	writer_Mac_More \
+	writer_Mac_RagTime \
 	writer_Mac_Word \
 	writer_Mac_Works \
 	writer_MacDoc \
@@ -395,6 +396,7 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi
 	LightWayText \
 	Mac_Acta \
 	Mac_More \
+	Mac_RagTime \
 	Mac_Word \
 	Mac_Works \
 	MacDoc \
@@ -625,6 +627,8 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s
 	draw_Beagle_Works \
 	draw_ClarisWorks \
 	draw_Great_Works \
+	draw_MacDraw \
+	draw_MacDrawPro \
 	draw_Mac_Works \
 	draw_MacPaint \
 	draw_SuperPaint \
@@ -647,6 +651,8 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filt
 	Beagle_Works_Draw \
 	ClarisWorks_Draw \
 	Great_Works_Draw \
+	MacDraw_Draw \
+	MacDrawPro_Draw \
 	Mac_Works_Draw \
 	MacPaint_Draw \
 	SuperPaint_Draw \

filter/source/config/fragments/filters/MacDrawPro_Draw.xcu

+<!--
+ * 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 USESOPTIONS 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">MacDraw II</value>
+        </prop>
+        <prop oor:name="FileFormatVersion"><value>0</value></prop>
+        <prop oor:name="Type"><value>draw_MacDrawPro</value></prop>
+        <prop oor:name="TemplateName"/>
+        <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+    </node>

filter/source/config/fragments/filters/MacDraw_Draw.xcu

+<!--
+ * 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="MacDraw_Draw" oor:op="replace">
+        <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop>
+        <prop oor:name="UIComponent"/>
+        <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</value></prop>
+        <prop oor:name="UserData"><value></value></prop>
+        <prop oor:name="UIName">
+            <value xml:lang="en-US">MacDraw (v0-v1)</value>
+        </prop>
+        <prop oor:name="FileFormatVersion"><value>0</value></prop>
+        <prop oor:name="Type"><value>draw_MacDraw</value></prop>
+        <prop oor:name="TemplateName"/>
+        <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+    </node>

filter/source/config/fragments/filters/Mac_RagTime.xcu

+<!--
+ * 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 USESOPTIONS 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-3 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>

filter/source/config/fragments/types/draw_MacDraw.xcu

+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+    <node oor:name="draw_MacDraw" oor:op="replace" >
+        <prop oor:name="DetectService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</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>MacDraw_Draw</value></prop>
+        <prop oor:name="UIName">
+            <value>MacDraw (v0-v1)</value>
+        </prop>
+        <prop oor:name="ClipboardFormat"/>
+    </node>

filter/source/config/fragments/types/draw_MacDrawPro.xcu

+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+    <node oor:name="draw_MacDrawPro" oor:op="replace" >
+        <prop oor:name="DetectService"><value>com.sun.star.comp.Draw.MWAWDrawImportFilter</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>MacDrawPro_Draw</value></prop>
+        <prop oor:name="UIName">
+            <value>MacDraw II</value>
+        </prop>
+        <prop oor:name="ClipboardFormat"/>
+    </node>

filter/source/config/fragments/types/writer_Mac_RagTime.xcu

+<!--
+ * 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>

writerperfect/source/draw/MWAWDrawImportFilter.cxx

@@ -67,6 +67,12 @@ bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, O
             case MWAWDocument::MWAW_T_GREATWORKS:
                 rTypeName = "draw_Great_Works";
                 break;
+            case MWAWDocument::MWAW_T_MACDRAW:
+                rTypeName = "draw_MacDraw";
+                break;
+            case MWAWDocument::MWAW_T_MACDRAWPRO:
+                rTypeName = "draw_MacDrawPro";
+                break;
             case MWAWDocument::MWAW_T_MACPAINT:
                 rTypeName = "draw_MacPaint";
                 break;
@@ -97,8 +103,6 @@ bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, O
             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_MACWRITE:
             case MWAWDocument::MWAW_T_MACWRITEPRO:
             case MWAWDocument::MWAW_T_MARINERWRITE:

writerperfect/source/writer/MWAWImportFilter.cxx

@@ -114,6 +114,9 @@ bool MWAWImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUStr
             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;
@@ -151,7 +154,6 @@ bool MWAWImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, OUStr
             case MWAWDocument::MWAW_T_PAGEMAKER:
             case MWAWDocument::MWAW_T_PIXELPAINT:
             case MWAWDocument::MWAW_T_READYSETGO:
-            case MWAWDocument::MWAW_T_RAGTIME:
             case MWAWDocument::MWAW_T_SUPERPAINT:
             case MWAWDocument::MWAW_T_SYMPOSIUM:
             case MWAWDocument::MWAW_T_TRAPEZE: