diff options
author | David Tardon <dtardon@redhat.com> | 2014-05-29 13:03:31 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-05-29 13:37:01 +0200 |
commit | a45b0bcf91f228a1b2125c2c63cf68d692872534 (patch) | |
tree | 10891c675f98fe9b0ede84db4418f6d4b3226e45 /writerperfect | |
parent | ca8494e8717136c838a8b7a464005afca7165854 (diff) |
fix return value for libe-book import filter
Change-Id: Idd84489a3123d506166a24ff5c85a4e7f75ee676
(cherry picked from commit 5fde8e38c127a872a66b8029b69aff55b01d6d88)
Diffstat (limited to 'writerperfect')
-rw-r--r-- | writerperfect/source/writer/EBookImportFilter.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx index 300376895984..efe5334935cb 100644 --- a/writerperfect/source/writer/EBookImportFilter.cxx +++ b/writerperfect/source/writer/EBookImportFilter.cxx @@ -28,18 +28,23 @@ using libebook::EBOOKDocument; bool EBookImportFilter::doImportDocument( librevenge::RVNGInputStream &rInput, const rtl::OUString &rFilterName, librevenge::RVNGTextInterface &rGenerator ) { + EBOOKDocument::Type type = EBOOKDocument::TYPE_UNKNOWN; + if (rFilterName == "FictionBook 2") - return EBOOKDocument::parse(&rInput, &rGenerator, EBOOKDocument::TYPE_FICTIONBOOK2); + type = EBOOKDocument::TYPE_FICTIONBOOK2; else if (rFilterName == "PalmDoc") - return EBOOKDocument::parse(&rInput, &rGenerator, EBOOKDocument::TYPE_PALMDOC); + type = EBOOKDocument::TYPE_PALMDOC; else if (rFilterName == "Plucker eBook") - return EBOOKDocument::parse(&rInput, &rGenerator, EBOOKDocument::TYPE_PLUCKER); + type = EBOOKDocument::TYPE_PLUCKER; else if (rFilterName == "eReader eBook") - return EBOOKDocument::parse(&rInput, &rGenerator, EBOOKDocument::TYPE_PEANUTPRESS); + type = EBOOKDocument::TYPE_PEANUTPRESS; else if (rFilterName == "TealDoc") - return EBOOKDocument::parse(&rInput, &rGenerator, EBOOKDocument::TYPE_TEALDOC); + type = EBOOKDocument::TYPE_TEALDOC; else if (rFilterName == "zTXT") - return EBOOKDocument::parse(&rInput, &rGenerator, EBOOKDocument::TYPE_ZTXT); + type = EBOOKDocument::TYPE_ZTXT; + + if (EBOOKDocument::TYPE_UNKNOWN != type) + return EBOOKDocument::RESULT_OK == EBOOKDocument::parse(&rInput, &rGenerator, type); return false; } |