diff options
| author | osnola <alonso@loria.fr> | 2014-10-10 10:25:31 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-10-16 17:44:43 +0200 |
| commit | 57d3b5cfa6bdd60ec5b3046bdd824e4f0adf3b30 (patch) | |
| tree | dec31e27f416f8d3a5397c7e3d304af1209411ab /writerperfect/source | |
| parent | 39428437d5ed9893007c915175f54c21dd03f95f (diff) | |
Update to last libmwaw version
+ add filters for MacDraw, MacDraw II and RagTime (v2-3 for Mac)
Change-Id: If84abff1baa75f9bfa951039781575b6a8648a84
Diffstat (limited to 'writerperfect/source')
| -rw-r--r-- | writerperfect/source/draw/MWAWDrawImportFilter.cxx | 8 | ||||
| -rw-r--r-- | writerperfect/source/writer/MWAWImportFilter.cxx | 4 |
2 files changed, 9 insertions, 3 deletions
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: |