From 57d3b5cfa6bdd60ec5b3046bdd824e4f0adf3b30 Mon Sep 17 00:00:00 2001 From: osnola Date: Fri, 10 Oct 2014 10:25:31 +0200 Subject: Update to last libmwaw version + add filters for MacDraw, MacDraw II and RagTime (v2-3 for Mac) Change-Id: If84abff1baa75f9bfa951039781575b6a8648a84 --- download.lst | 4 +-- external/libmwaw/Library_mwaw.mk | 2 +- external/libmwaw/UnpackedTarball_libmwaw.mk | 8 ------ filter/Configuration_filter.mk | 6 +++++ .../config/fragments/filters/MacDrawPro_Draw.xcu | 30 ++++++++++++++++++++++ .../config/fragments/filters/MacDraw_Draw.xcu | 30 ++++++++++++++++++++++ .../config/fragments/filters/Mac_RagTime.xcu | 29 +++++++++++++++++++++ .../source/config/fragments/types/draw_MacDraw.xcu | 29 +++++++++++++++++++++ .../config/fragments/types/draw_MacDrawPro.xcu | 29 +++++++++++++++++++++ .../config/fragments/types/writer_Mac_RagTime.xcu | 29 +++++++++++++++++++++ writerperfect/source/draw/MWAWDrawImportFilter.cxx | 8 ++++-- writerperfect/source/writer/MWAWImportFilter.cxx | 4 ++- 12 files changed, 194 insertions(+), 14 deletions(-) create mode 100644 filter/source/config/fragments/filters/MacDrawPro_Draw.xcu create mode 100644 filter/source/config/fragments/filters/MacDraw_Draw.xcu create mode 100644 filter/source/config/fragments/filters/Mac_RagTime.xcu create mode 100644 filter/source/config/fragments/types/draw_MacDraw.xcu create mode 100644 filter/source/config/fragments/types/draw_MacDrawPro.xcu create mode 100644 filter/source/config/fragments/types/writer_Mac_RagTime.xcu diff --git a/download.lst b/download.lst index 3be0bbc4e828..f0d22c4d01a6 100644 --- a/download.lst +++ b/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 diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk index fa65c82d6042..92ab48a07fe6 100644 --- a/external/libmwaw/Library_mwaw.mk +++ b/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)) diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk index cfa63c56462d..61c43a709559 100644 --- a/external/libmwaw/UnpackedTarball_libmwaw.mk +++ b/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: diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 36d758454534..a5363115c56d 100644 --- a/filter/Configuration_filter.mk +++ b/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 \ diff --git a/filter/source/config/fragments/filters/MacDrawPro_Draw.xcu b/filter/source/config/fragments/filters/MacDrawPro_Draw.xcu new file mode 100644 index 000000000000..3c9db451240e --- /dev/null +++ b/filter/source/config/fragments/filters/MacDrawPro_Draw.xcu @@ -0,0 +1,30 @@ + + + IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED + + com.sun.star.comp.Draw.MWAWDrawImportFilter + + + MacDraw II + + 0 + draw_MacDrawPro + + com.sun.star.drawing.DrawingDocument + diff --git a/filter/source/config/fragments/filters/MacDraw_Draw.xcu b/filter/source/config/fragments/filters/MacDraw_Draw.xcu new file mode 100644 index 000000000000..c7c48d0bb378 --- /dev/null +++ b/filter/source/config/fragments/filters/MacDraw_Draw.xcu @@ -0,0 +1,30 @@ + + + IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED + + com.sun.star.comp.Draw.MWAWDrawImportFilter + + + MacDraw (v0-v1) + + 0 + draw_MacDraw + + com.sun.star.drawing.DrawingDocument + diff --git a/filter/source/config/fragments/filters/Mac_RagTime.xcu b/filter/source/config/fragments/filters/Mac_RagTime.xcu new file mode 100644 index 000000000000..66be2a3051c4 --- /dev/null +++ b/filter/source/config/fragments/filters/Mac_RagTime.xcu @@ -0,0 +1,29 @@ + + + + + IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED + + + com.sun.star.comp.Writer.MWAWImportFilter + + + RagTime Mac v2-3 Document + + + 0 + + + writer_Mac_RagTime + + + com.sun.star.text.TextDocument + + diff --git a/filter/source/config/fragments/types/draw_MacDraw.xcu b/filter/source/config/fragments/types/draw_MacDraw.xcu new file mode 100644 index 000000000000..dac298475f1f --- /dev/null +++ b/filter/source/config/fragments/types/draw_MacDraw.xcu @@ -0,0 +1,29 @@ + + + com.sun.star.comp.Draw.MWAWDrawImportFilter + + dummy + + true + MacDraw_Draw + + MacDraw (v0-v1) + + + diff --git a/filter/source/config/fragments/types/draw_MacDrawPro.xcu b/filter/source/config/fragments/types/draw_MacDrawPro.xcu new file mode 100644 index 000000000000..903f702c30d3 --- /dev/null +++ b/filter/source/config/fragments/types/draw_MacDrawPro.xcu @@ -0,0 +1,29 @@ + + + com.sun.star.comp.Draw.MWAWDrawImportFilter + + dummy + + true + MacDrawPro_Draw + + MacDraw II + + + diff --git a/filter/source/config/fragments/types/writer_Mac_RagTime.xcu b/filter/source/config/fragments/types/writer_Mac_RagTime.xcu new file mode 100644 index 000000000000..81dc022db69c --- /dev/null +++ b/filter/source/config/fragments/types/writer_Mac_RagTime.xcu @@ -0,0 +1,29 @@ + + + + + com.sun.star.comp.Writer.MWAWImportFilter + + + dummy + + + + + + true + + + Mac_RagTime + + + RagTime Mac v2-3 Document + + diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx index 694bb3fc8bcc..535a084c970a 100644 --- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx +++ b/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: diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx index 1d37ff0bf19c..03c43cc0c69a 100644 --- a/writerperfect/source/writer/MWAWImportFilter.cxx +++ b/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: -- cgit