diff options
| author | osnola <alonso@loria.fr> | 2015-11-26 09:59:54 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-11-29 14:08:38 +0100 |
| commit | 70a11143ada618a37c2bd5c0c27947a834bc13bb (patch) | |
| tree | e3f8983705de1195febefcb431fc3435358f3ac5 /writerperfect/source/draw | |
| parent | 13c8fe55de98560e136b741addbf8f78fd934bd5 (diff) | |
enable new file formats supported by libmwaw-0.3.7
Change-Id: I03d0f112f74dce6c307258d9765281d91cdd3a03
Diffstat (limited to 'writerperfect/source/draw')
| -rw-r--r-- | writerperfect/source/draw/MWAWDrawImportFilter.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx index 8b5b21acb6be..3e90a026859c 100644 --- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx +++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx @@ -35,6 +35,7 @@ static bool handleEmbeddedMWAWGraphicObject(const librevenge::RVNGBinaryData &da static bool handleEmbeddedMWAWSpreadsheetObject(const librevenge::RVNGBinaryData &data, OdfDocumentHandler *pHandler, const OdfStreamType streamType) { OdsGenerator exporter; + exporter.registerEmbeddedObjectHandler("image/mwaw-odg", &handleEmbeddedMWAWGraphicObject); exporter.addDocumentHandler(pHandler, streamType); return MWAWDocument::decodeSpreadsheet(data, &exporter); } @@ -82,10 +83,13 @@ bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, O 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: + case MWAWDocument::MWAW_T_RESERVED1: // also MWAWDocument::MWAW_T_CLARISDRAW rTypeName = "draw_ClarisDraw"; break; @@ -119,7 +123,6 @@ bool MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream &rInput, O 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_SYMPOSIUM: |