From 83d30fdbcba0df628c9c6dd51a868e0fa32b0eef Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 8 Dec 2015 14:42:30 +0100 Subject: [PATCH] merge libmwaw format specs (draw) Change-Id: Ia0dfe1e1ce1ab2b1ef266d1aa0950fd6670b0c50 --- filter/Configuration_filter.mk | 24 +---- .../config/fragments/filters/ClarisDraw.xcu | 30 ------ .../{Great_Works_Draw.xcu => MWAW_Bitmap.xcu} | 6 +- ...Beagle_Works_Draw.xcu => MWAW_Drawing.xcu} | 6 +- .../config/fragments/filters/MacDraft.xcu | 30 ------ .../fragments/filters/MacDrawPro_Draw.xcu | 30 ------ .../config/fragments/filters/MacDraw_Draw.xcu | 30 ------ .../fragments/filters/MacPaint_Draw.xcu | 30 ------ .../fragments/filters/Mac_Works_Draw.xcu | 30 ------ .../fragments/filters/PixelPaint_Draw.xcu | 30 ------ .../fragments/filters/SuperPaint_Draw.xcu | 30 ------ .../{draw_Great_Works.xcu => MWAW_Bitmap.xcu} | 12 +-- ...draw_Beagle_Works.xcu => MWAW_Drawing.xcu} | 12 +-- .../fragments/types/draw_ClarisDraw.xcu | 29 ----- .../config/fragments/types/draw_MacDraft.xcu | 29 ----- .../config/fragments/types/draw_MacDraw.xcu | 29 ----- .../fragments/types/draw_MacDrawPro.xcu | 29 ----- .../config/fragments/types/draw_MacPaint.xcu | 29 ----- .../config/fragments/types/draw_Mac_Works.xcu | 29 ----- .../fragments/types/draw_PixelPaint.xcu | 29 ----- .../fragments/types/draw_SuperPaint.xcu | 29 ----- .../source/draw/MWAWDrawImportFilter.cxx | 101 +++--------------- 22 files changed, 37 insertions(+), 596 deletions(-) delete mode 100644 filter/source/config/fragments/filters/ClarisDraw.xcu rename filter/source/config/fragments/filters/{Great_Works_Draw.xcu => MWAW_Bitmap.xcu} (83%) rename filter/source/config/fragments/filters/{Beagle_Works_Draw.xcu => MWAW_Drawing.xcu} (81%) delete mode 100644 filter/source/config/fragments/filters/MacDraft.xcu delete mode 100644 filter/source/config/fragments/filters/MacDrawPro_Draw.xcu delete mode 100644 filter/source/config/fragments/filters/MacDraw_Draw.xcu delete mode 100644 filter/source/config/fragments/filters/MacPaint_Draw.xcu delete mode 100644 filter/source/config/fragments/filters/Mac_Works_Draw.xcu delete mode 100644 filter/source/config/fragments/filters/PixelPaint_Draw.xcu delete mode 100644 filter/source/config/fragments/filters/SuperPaint_Draw.xcu rename filter/source/config/fragments/types/{draw_Great_Works.xcu => MWAW_Bitmap.xcu} (72%) rename filter/source/config/fragments/types/{draw_Beagle_Works.xcu => MWAW_Drawing.xcu} (70%) delete mode 100644 filter/source/config/fragments/types/draw_ClarisDraw.xcu delete mode 100644 filter/source/config/fragments/types/draw_MacDraft.xcu delete mode 100644 filter/source/config/fragments/types/draw_MacDraw.xcu delete mode 100644 filter/source/config/fragments/types/draw_MacDrawPro.xcu delete mode 100644 filter/source/config/fragments/types/draw_MacPaint.xcu delete mode 100644 filter/source/config/fragments/types/draw_Mac_Works.xcu delete mode 100644 filter/source/config/fragments/types/draw_PixelPaint.xcu delete mode 100644 filter/source/config/fragments/types/draw_SuperPaint.xcu diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index fe303dda4f14..166750a08ed7 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 deb250cb0e63..000000000000 --- a/filter/source/config/fragments/filters/ClarisDraw.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - - IMPORT ALIEN 3RDPARTYFILTER PREFERRED - - com.sun.star.comp.Draw.MWAWDrawImportFilter - - - ClarisDraw - - 0 - draw_ClarisDraw - - com.sun.star.drawing.DrawingDocument - 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 27ebf0ec86e1..034b72132219 100644 --- a/filter/source/config/fragments/filters/Great_Works_Draw.xcu +++ b/filter/source/config/fragments/filters/MWAW_Bitmap.xcu @@ -7,7 +7,7 @@ * --> - + IMPORT ALIEN 3RDPARTYFILTER PREFERRED @@ -15,13 +15,13 @@ com.sun.star.comp.Draw.MWAWDrawImportFilter - GreatWorks Drawing + Legacy Mac Bitmap 0 - draw_Great_Works + MWAW_Bitmap com.sun.star.drawing.DrawingDocument 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 1cec0bb1c0e7..b92f378497dd 100644 --- a/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu +++ b/filter/source/config/fragments/filters/MWAW_Drawing.xcu @@ -7,7 +7,7 @@ * --> - + IMPORT ALIEN 3RDPARTYFILTER PREFERRED @@ -15,13 +15,13 @@ com.sun.star.comp.Draw.MWAWDrawImportFilter - BeagleWorks/WordPerfect Works v1 Drawing + Legacy Mac Drawing 0 - draw_Beagle_Works + MWAW_Drawing com.sun.star.drawing.DrawingDocument diff --git a/filter/source/config/fragments/filters/MacDraft.xcu b/filter/source/config/fragments/filters/MacDraft.xcu deleted file mode 100644 index 7a704985cec3..000000000000 --- a/filter/source/config/fragments/filters/MacDraft.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - - IMPORT ALIEN 3RDPARTYFILTER PREFERRED - - com.sun.star.comp.Draw.MWAWDrawImportFilter - - - MacDraft - - 0 - draw_MacDraft - - com.sun.star.drawing.DrawingDocument - 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 633e6c04b016..000000000000 --- a/filter/source/config/fragments/filters/MacDrawPro_Draw.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - - IMPORT ALIEN 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 deleted file mode 100644 index 6b2af4cc8f86..000000000000 --- a/filter/source/config/fragments/filters/MacDraw_Draw.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - - IMPORT ALIEN 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/MacPaint_Draw.xcu b/filter/source/config/fragments/filters/MacPaint_Draw.xcu deleted file mode 100644 index dea46694db63..000000000000 --- a/filter/source/config/fragments/filters/MacPaint_Draw.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - - IMPORT ALIEN 3RDPARTYFILTER PREFERRED - - com.sun.star.comp.Draw.MWAWDrawImportFilter - - - MacPaint (v1) - - 0 - draw_MacPaint - - com.sun.star.drawing.DrawingDocument - diff --git a/filter/source/config/fragments/filters/Mac_Works_Draw.xcu b/filter/source/config/fragments/filters/Mac_Works_Draw.xcu deleted file mode 100644 index 792c89d6e74c..000000000000 --- a/filter/source/config/fragments/filters/Mac_Works_Draw.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - - IMPORT ALIEN 3RDPARTYFILTER PREFERRED - - com.sun.star.comp.Draw.MWAWDrawImportFilter - - - Microsoft Works for Mac Drawing (v1 - v4) - - 0 - draw_Mac_Works - - com.sun.star.drawing.DrawingDocument - diff --git a/filter/source/config/fragments/filters/PixelPaint_Draw.xcu b/filter/source/config/fragments/filters/PixelPaint_Draw.xcu deleted file mode 100644 index ce6c9385235d..000000000000 --- a/filter/source/config/fragments/filters/PixelPaint_Draw.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - - IMPORT ALIEN 3RDPARTYFILTER PREFERRED - - com.sun.star.comp.Draw.MWAWDrawImportFilter - - - PixelPaint (v1) - - 0 - draw_PixelPaint - - com.sun.star.drawing.DrawingDocument - diff --git a/filter/source/config/fragments/filters/SuperPaint_Draw.xcu b/filter/source/config/fragments/filters/SuperPaint_Draw.xcu deleted file mode 100644 index aa4f5afea9a7..000000000000 --- a/filter/source/config/fragments/filters/SuperPaint_Draw.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - - IMPORT ALIEN 3RDPARTYFILTER PREFERRED - - com.sun.star.comp.Draw.MWAWDrawImportFilter - - - SuperPaint (v1) - - 0 - draw_SuperPaint - - com.sun.star.drawing.DrawingDocument - diff --git a/filter/source/config/fragments/types/draw_Great_Works.xcu b/filter/source/config/fragments/types/MWAW_Bitmap.xcu similarity index 72% rename from filter/source/config/fragments/types/draw_Great_Works.xcu rename to filter/source/config/fragments/types/MWAW_Bitmap.xcu index f9aeb0781f0f..532f1060968b 100644 --- a/filter/source/config/fragments/types/draw_Great_Works.xcu +++ b/filter/source/config/fragments/types/MWAW_Bitmap.xcu @@ -7,23 +7,21 @@ * --> - + com.sun.star.comp.Draw.MWAWDrawImportFilter - dummy - - - + * + true - Great_Works_Draw + MWAW_Bitmap - GreatWorks Document + Legacy Mac Bitmap diff --git a/filter/source/config/fragments/types/draw_Beagle_Works.xcu b/filter/source/config/fragments/types/MWAW_Drawing.xcu similarity index 70% rename from filter/source/config/fragments/types/draw_Beagle_Works.xcu rename to filter/source/config/fragments/types/MWAW_Drawing.xcu index 177ad9713d94..3edba277e0b5 100644 --- a/filter/source/config/fragments/types/draw_Beagle_Works.xcu +++ b/filter/source/config/fragments/types/MWAW_Drawing.xcu @@ -7,23 +7,21 @@ * --> - + com.sun.star.comp.Draw.MWAWDrawImportFilter - dummy - - - + * + true - Beagle_Works_Draw + MWAW_Drawing - BeagleWorks/WordPerfect Works Document + Legacy Mac Drawing diff --git a/filter/source/config/fragments/types/draw_ClarisDraw.xcu b/filter/source/config/fragments/types/draw_ClarisDraw.xcu deleted file mode 100644 index d4ddbeaf9faa..000000000000 --- a/filter/source/config/fragments/types/draw_ClarisDraw.xcu +++ /dev/null @@ -1,29 +0,0 @@ - - - com.sun.star.comp.Draw.MWAWDrawImportFilter - - dummy - - true - ClarisDraw - - ClarisDraw - - - diff --git a/filter/source/config/fragments/types/draw_MacDraft.xcu b/filter/source/config/fragments/types/draw_MacDraft.xcu deleted file mode 100644 index 47a778cbb884..000000000000 --- a/filter/source/config/fragments/types/draw_MacDraft.xcu +++ /dev/null @@ -1,29 +0,0 @@ - - - com.sun.star.comp.Draw.MWAWDrawImportFilter - - dummy - - true - MacDraft - - MacDraft - - - diff --git a/filter/source/config/fragments/types/draw_MacDraw.xcu b/filter/source/config/fragments/types/draw_MacDraw.xcu deleted file mode 100644 index dac298475f1f..000000000000 --- a/filter/source/config/fragments/types/draw_MacDraw.xcu +++ /dev/null @@ -1,29 +0,0 @@ - - - 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 deleted file mode 100644 index 903f702c30d3..000000000000 --- a/filter/source/config/fragments/types/draw_MacDrawPro.xcu +++ /dev/null @@ -1,29 +0,0 @@ - - - com.sun.star.comp.Draw.MWAWDrawImportFilter - - dummy - - true - MacDrawPro_Draw - - MacDraw II - - - diff --git a/filter/source/config/fragments/types/draw_MacPaint.xcu b/filter/source/config/fragments/types/draw_MacPaint.xcu deleted file mode 100644 index 4cadffdcc6a5..000000000000 --- a/filter/source/config/fragments/types/draw_MacPaint.xcu +++ /dev/null @@ -1,29 +0,0 @@ - - - com.sun.star.comp.Draw.MWAWDrawImportFilter - - dummy - - true - MacPaint_Draw - - MacPaint (v1) - - - diff --git a/filter/source/config/fragments/types/draw_Mac_Works.xcu b/filter/source/config/fragments/types/draw_Mac_Works.xcu deleted file mode 100644 index 15dea5441aed..000000000000 --- a/filter/source/config/fragments/types/draw_Mac_Works.xcu +++ /dev/null @@ -1,29 +0,0 @@ - - - com.sun.star.comp.Draw.MWAWDrawImportFilter - - dummy - - true - Mac_Works_Draw - - Microsoft Works for Mac Document (v1 - v4) - - - diff --git a/filter/source/config/fragments/types/draw_PixelPaint.xcu b/filter/source/config/fragments/types/draw_PixelPaint.xcu deleted file mode 100644 index 2a03ad6dcbab..000000000000 --- a/filter/source/config/fragments/types/draw_PixelPaint.xcu +++ /dev/null @@ -1,29 +0,0 @@ - - - com.sun.star.comp.Draw.MWAWDrawImportFilter - - dummy - - true - PixelPaint_Draw - - PixelPaint (v1) - - - diff --git a/filter/source/config/fragments/types/draw_SuperPaint.xcu b/filter/source/config/fragments/types/draw_SuperPaint.xcu deleted file mode 100644 index 6f7e349de7a4..000000000000 --- a/filter/source/config/fragments/types/draw_SuperPaint.xcu +++ /dev/null @@ -1,29 +0,0 @@ - - - com.sun.star.comp.Draw.MWAWDrawImportFilter - - dummy - - true - SuperPaint_Draw - - SuperPaint (v1) - - - diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx index 3e90a026859c..ed9947fdc4b1 100644 --- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx +++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx @@ -55,99 +55,32 @@ bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, O if (confidence == MWAWDocument::MWAW_C_EXCELLENT) { - if (docKind == MWAWDocument::MWAW_K_DRAW || docKind == MWAWDocument::MWAW_K_PAINT) + switch (docKind) { + case MWAWDocument::MWAW_K_DRAW: switch (docType) { - case MWAWDocument::MWAW_T_BEAGLEWORKS: - rTypeName = "draw_Beagle_Works"; - break; case MWAWDocument::MWAW_T_CLARISWORKS: rTypeName = "draw_ClarisWorks"; break; - case MWAWDocument::MWAW_T_GREATWORKS: - rTypeName = "draw_Great_Works"; - break; - case MWAWDocument::MWAW_T_MACDRAFT: - rTypeName = "draw_MacDraft"; - 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; - case MWAWDocument::MWAW_T_MICROSOFTWORKS: - rTypeName = "draw_Mac_Works"; - break; - case MWAWDocument::MWAW_T_PIXELPAINT: - rTypeName = "draw_PixelPaint"; - break; - case MWAWDocument::MWAW_T_SUPERPAINT: - rTypeName = "draw_SuperPaint"; - break; - case MWAWDocument::MWAW_T_RESERVED1: // also MWAWDocument::MWAW_T_CLARISDRAW - rTypeName = "draw_ClarisDraw"; - break; - - case MWAWDocument::MWAW_T_ACTA: - 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_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_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_MORE: - case MWAWDocument::MWAW_T_NISUSWRITER: - case MWAWDocument::MWAW_T_OVERVUE: - case MWAWDocument::MWAW_T_PAGEMAKER: - case MWAWDocument::MWAW_T_RAGTIME: - case MWAWDocument::MWAW_T_READYSETGO: - 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_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_Drawing"; break; } + break; + case MWAWDocument::MWAW_K_PAINT: + switch (docType) + { + case MWAWDocument::MWAW_T_CLARISWORKS: + rTypeName = "draw_ClarisWorks"; + break; + default: + rTypeName = "MWAW_Bitmap"; + break; + } + break; + default: + break; } }