diff options
| author | David Tardon <dtardon@redhat.com> | 2014-09-17 10:44:51 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-09-17 19:26:25 +0200 |
| commit | 3c8af5367de69ea74506f6f630276e9dfd8ff51f (patch) | |
| tree | 001afb7474a1d793982432d689f8f10b9c80d0e8 /writerperfect/source/writer/EBookImportFilter.cxx | |
| parent | bnc#591147: unit test for media files import (diff) | |
| download | core-3c8af5367de69ea74506f6f630276e9dfd8ff51f.tar.gz core-3c8af5367de69ea74506f6f630276e9dfd8ff51f.zip | |
pass the whole descriptor instead of filter name
Change-Id: I874e53a00d48ba84588126c1ecdb90c801a9b1d6
Diffstat (limited to 'writerperfect/source/writer/EBookImportFilter.cxx')
| -rw-r--r-- | writerperfect/source/writer/EBookImportFilter.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx index 003e603e95e6..14c4a48366a9 100644 --- a/writerperfect/source/writer/EBookImportFilter.cxx +++ b/writerperfect/source/writer/EBookImportFilter.cxx @@ -26,21 +26,26 @@ using com::sun::star::uno::XComponentContext; using libebook::EBOOKDocument; -bool EBookImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, const rtl::OUString &rFilterName, librevenge::RVNGTextInterface &rGenerator) +bool EBookImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGTextInterface &rGenerator, utl::MediaDescriptor &rDescriptor) { EBOOKDocument::Type type = EBOOKDocument::TYPE_UNKNOWN; - if (rFilterName == "FictionBook 2") + rtl::OUString aFilterName; + + rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] >>= aFilterName; + assert(!aFilterName.isEmpty()); + + if (aFilterName == "FictionBook 2") type = EBOOKDocument::TYPE_FICTIONBOOK2; - else if (rFilterName == "PalmDoc") + else if (aFilterName == "PalmDoc") type = EBOOKDocument::TYPE_PALMDOC; - else if (rFilterName == "Plucker eBook") + else if (aFilterName == "Plucker eBook") type = EBOOKDocument::TYPE_PLUCKER; - else if (rFilterName == "eReader eBook") + else if (aFilterName == "eReader eBook") type = EBOOKDocument::TYPE_PEANUTPRESS; - else if (rFilterName == "TealDoc") + else if (aFilterName == "TealDoc") type = EBOOKDocument::TYPE_TEALDOC; - else if (rFilterName == "zTXT") + else if (aFilterName == "zTXT") type = EBOOKDocument::TYPE_ZTXT; if (EBOOKDocument::TYPE_UNKNOWN != type) |