diff options
author | David Tardon <dtardon@redhat.com> | 2014-09-17 10:24:01 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-09-17 19:26:25 +0200 |
commit | 10572dbff870228e802b08da6728a5e28d1928b5 (patch) | |
tree | 5431300daf193f0a8700bb62bbe362842f809a23 /writerperfect/source/calc | |
parent | 3c8af5367de69ea74506f6f630276e9dfd8ff51f (diff) |
pass media descriptor to import functions
Change-Id: I0c3e9c7ba83ef886958789706929b2eede30c343
Diffstat (limited to 'writerperfect/source/calc')
6 files changed, 9 insertions, 6 deletions
diff --git a/writerperfect/source/calc/ImportFilterBase.cxx b/writerperfect/source/calc/ImportFilterBase.cxx index 330cb6eb5c36..1f9ede0390aa 100644 --- a/writerperfect/source/calc/ImportFilterBase.cxx +++ b/writerperfect/source/calc/ImportFilterBase.cxx @@ -97,7 +97,8 @@ throw (RuntimeException, std::exception) doRegisterHandlers(exporter); - return doImportDocument(input, exporter); + utl::MediaDescriptor aMediaDescriptor(aDescriptor); + return doImportDocument(input, exporter, aMediaDescriptor); } void SAL_CALL ImportFilterImpl::cancel() diff --git a/writerperfect/source/calc/ImportFilterBase.hxx b/writerperfect/source/calc/ImportFilterBase.hxx index dafeffcb083c..4b9d11da7af1 100644 --- a/writerperfect/source/calc/ImportFilterBase.hxx +++ b/writerperfect/source/calc/ImportFilterBase.hxx @@ -20,6 +20,8 @@ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase4.hxx> +#include <unotools/mediadescriptor.hxx> + namespace com { namespace sun @@ -91,7 +93,7 @@ public: private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) = 0; - virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGSpreadsheetInterface &rGenerator) = 0; + virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGSpreadsheetInterface &rGenerator, utl::MediaDescriptor &) = 0; virtual void doRegisterHandlers(OdsGenerator &rGenerator); private: diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index 6c9e316ef73d..fb3878720507 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx @@ -24,7 +24,7 @@ using com::sun::star::uno::Exception; using com::sun::star::uno::RuntimeException; using com::sun::star::uno::XComponentContext; -bool MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGSpreadsheetInterface &rGenerator) +bool MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGSpreadsheetInterface &rGenerator, utl::MediaDescriptor &) { return libwps::WPS_OK == libwps::WPSDocument::parse(&rInput, &rGenerator); } diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.hxx b/writerperfect/source/calc/MSWorksCalcImportFilter.hxx index dfe43d117487..c719d71ba8bf 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.hxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.hxx @@ -34,7 +34,7 @@ public: private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE; - virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGSpreadsheetInterface &rGenerator) SAL_OVERRIDE; + virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGSpreadsheetInterface &rGenerator, utl::MediaDescriptor &) SAL_OVERRIDE; virtual void doRegisterHandlers(OdsGenerator &rGenerator) SAL_OVERRIDE; }; diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx b/writerperfect/source/calc/MWAWCalcImportFilter.cxx index e7a7e3ed2e23..435fc98683e7 100644 --- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx +++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx @@ -39,7 +39,7 @@ static bool handleEmbeddedMWAWSpreadsheetObject(const librevenge::RVNGBinaryData return MWAWDocument::decodeSpreadsheet(data, &exporter); } -bool MWAWCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGSpreadsheetInterface &rGenerator) +bool MWAWCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGSpreadsheetInterface &rGenerator, utl::MediaDescriptor &) { return MWAWDocument::MWAW_R_OK == MWAWDocument::parse(&rInput, &rGenerator); } diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.hxx b/writerperfect/source/calc/MWAWCalcImportFilter.hxx index 2624fe2ab1fc..97714e7ee7c9 100644 --- a/writerperfect/source/calc/MWAWCalcImportFilter.hxx +++ b/writerperfect/source/calc/MWAWCalcImportFilter.hxx @@ -34,7 +34,7 @@ public: private: virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE; - virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGSpreadsheetInterface &rGenerator) SAL_OVERRIDE; + virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGSpreadsheetInterface &rGenerator, utl::MediaDescriptor &) SAL_OVERRIDE; virtual void doRegisterHandlers(OdsGenerator &rGenerator) SAL_OVERRIDE; }; |