Skip to content

C
core
Kaydet (Commit) 10572dbf authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

pass media descriptor to import functions 

Change-Id: I0c3e9c7ba83ef886958789706929b2eede30c343
üst 3c8af536
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 24 deletions
writerperfect/source/calc/ImportFilterBase.cxx
Dosyayı görüntüle @ 10572dbf
...@@ -97,7 +97,8 @@ throw (RuntimeException, std::exception) ...@@ -97,7 +97,8 @@ throw (RuntimeException, std::exception)
doRegisterHandlers(exporter); doRegisterHandlers(exporter);
return doImportDocument(input, exporter); utl::MediaDescriptor aMediaDescriptor(aDescriptor);
return doImportDocument(input, exporter, aMediaDescriptor);
} }
void SAL_CALL ImportFilterImpl::cancel() void SAL_CALL ImportFilterImpl::cancel()
......
writerperfect/source/calc/ImportFilterBase.hxx
Dosyayı görüntüle @ 10572dbf
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase4.hxx>
#include <unotools/mediadescriptor.hxx>
namespace com namespace com
{ {
namespace sun namespace sun
...@@ -91,7 +93,7 @@ public: ...@@ -91,7 +93,7 @@ public:
private: private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) = 0; 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); virtual void doRegisterHandlers(OdsGenerator &rGenerator);
private: private:
......
writerperfect/source/calc/MSWorksCalcImportFilter.cxx
Dosyayı görüntüle @ 10572dbf
...@@ -24,7 +24,7 @@ using com::sun::star::uno::Exception; ...@@ -24,7 +24,7 @@ using com::sun::star::uno::Exception;
using com::sun::star::uno::RuntimeException; using com::sun::star::uno::RuntimeException;
using com::sun::star::uno::XComponentContext; 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); return libwps::WPS_OK == libwps::WPSDocument::parse(&rInput, &rGenerator);
} }
......
writerperfect/source/calc/MSWorksCalcImportFilter.hxx
Dosyayı görüntüle @ 10572dbf
...@@ -34,7 +34,7 @@ public: ...@@ -34,7 +34,7 @@ public:
private: private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE; 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; virtual void doRegisterHandlers(OdsGenerator &rGenerator) SAL_OVERRIDE;
}; };
......
writerperfect/source/calc/MWAWCalcImportFilter.cxx
Dosyayı görüntüle @ 10572dbf
...@@ -39,7 +39,7 @@ static bool handleEmbeddedMWAWSpreadsheetObject(const librevenge::RVNGBinaryData ...@@ -39,7 +39,7 @@ static bool handleEmbeddedMWAWSpreadsheetObject(const librevenge::RVNGBinaryData
return MWAWDocument::decodeSpreadsheet(data, &exporter); 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); return MWAWDocument::MWAW_R_OK == MWAWDocument::parse(&rInput, &rGenerator);
} }
......
writerperfect/source/calc/MWAWCalcImportFilter.hxx
Dosyayı görüntüle @ 10572dbf
...@@ -34,7 +34,7 @@ public: ...@@ -34,7 +34,7 @@ public:
private: private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE; 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; virtual void doRegisterHandlers(OdsGenerator &rGenerator) SAL_OVERRIDE;
}; };
......
writerperfect/source/draw/CDRImportFilter.cxx
Dosyayı görüntüle @ 10572dbf
...@@ -27,7 +27,7 @@ using com::sun::star::uno::Sequence; ...@@ -27,7 +27,7 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext; using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface; using com::sun::star::uno::XInterface;
bool CDRImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) bool CDRImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &)
{ {
return libcdr::CDRDocument::parse(&rInput, &rGenerator); return libcdr::CDRDocument::parse(&rInput, &rGenerator);
} }
......
writerperfect/source/draw/CDRImportFilter.hxx
Dosyayı görüntüle @ 10572dbf
...@@ -34,7 +34,7 @@ public: ...@@ -34,7 +34,7 @@ public:
private: private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE; virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE; virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &) SAL_OVERRIDE;
}; };
OUString CDRImportFilter_getImplementationName() OUString CDRImportFilter_getImplementationName()
......
writerperfect/source/draw/CMXImportFilter.cxx
Dosyayı görüntüle @ 10572dbf
...@@ -27,7 +27,7 @@ using com::sun::star::uno::Sequence; ...@@ -27,7 +27,7 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext; using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface; using com::sun::star::uno::XInterface;
bool CMXImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) bool CMXImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &)
{ {
return libcdr::CMXDocument::parse(&rInput, &rGenerator); return libcdr::CMXDocument::parse(&rInput, &rGenerator);
} }
......
writerperfect/source/draw/CMXImportFilter.hxx
Dosyayı görüntüle @ 10572dbf
...@@ -34,7 +34,7 @@ public: ...@@ -34,7 +34,7 @@ public:
private: private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE; virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE; virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &) SAL_OVERRIDE;
}; };
OUString CMXImportFilter_getImplementationName() OUString CMXImportFilter_getImplementationName()
......
writerperfect/source/draw/FreehandImportFilter.cxx
Dosyayı görüntüle @ 10572dbf
...@@ -23,7 +23,7 @@ using com::sun::star::uno::Sequence; ...@@ -23,7 +23,7 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext; using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface; using com::sun::star::uno::XInterface;
bool FreehandImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) bool FreehandImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &)
{ {
return libfreehand::FreeHandDocument::parse(&rInput, &rGenerator); return libfreehand::FreeHandDocument::parse(&rInput, &rGenerator);
} }
......
writerperfect/source/draw/FreehandImportFilter.hxx
Dosyayı görüntüle @ 10572dbf
...@@ -31,7 +31,7 @@ public: ...@@ -31,7 +31,7 @@ public:
private: private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE; virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE; virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &) SAL_OVERRIDE;
}; };
OUString FreehandImportFilter_getImplementationName() OUString FreehandImportFilter_getImplementationName()
......
writerperfect/source/draw/ImportFilterBase.cxx
Dosyayı görüntüle @ 10572dbf
...@@ -97,7 +97,8 @@ throw (RuntimeException, std::exception) ...@@ -97,7 +97,8 @@ throw (RuntimeException, std::exception)
doRegisterHandlers(exporter); doRegisterHandlers(exporter);
return doImportDocument(input, exporter); utl::MediaDescriptor aMediaDescriptor(aDescriptor);
return doImportDocument(input, exporter, aMediaDescriptor);
} }
void SAL_CALL ImportFilterImpl::cancel() void SAL_CALL ImportFilterImpl::cancel()
......
writerperfect/source/draw/ImportFilterBase.hxx
Dosyayı görüntüle @ 10572dbf
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase4.hxx>
#include <unotools/mediadescriptor.hxx>
namespace com namespace com
{ {
namespace sun namespace sun
...@@ -91,7 +93,7 @@ public: ...@@ -91,7 +93,7 @@ public:
private: private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) = 0; virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) = 0;
virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) = 0; virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &) = 0;
virtual void doRegisterHandlers(OdgGenerator &rGenerator); virtual void doRegisterHandlers(OdgGenerator &rGenerator);
private: private:
......
writerperfect/source/draw/MSPUBImportFilter.cxx
Dosyayı görüntüle @ 10572dbf
...@@ -25,7 +25,7 @@ using com::sun::star::uno::Sequence; ...@@ -25,7 +25,7 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext; using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface; using com::sun::star::uno::XInterface;
bool MSPUBImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) bool MSPUBImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &)
{ {
return libmspub::MSPUBDocument::parse(&rInput, &rGenerator); return libmspub::MSPUBDocument::parse(&rInput, &rGenerator);
} }
......
writerperfect/source/draw/MSPUBImportFilter.hxx
Dosyayı görüntüle @ 10572dbf
...@@ -31,7 +31,7 @@ public: ...@@ -31,7 +31,7 @@ public:
private: private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE; virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE; virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &) SAL_OVERRIDE;
}; };
OUString MSPUBImportFilter_getImplementationName() OUString MSPUBImportFilter_getImplementationName()
......
writerperfect/source/draw/MWAWDrawImportFilter.cxx
Dosyayı görüntüle @ 10572dbf
...@@ -39,7 +39,7 @@ static bool handleEmbeddedMWAWSpreadsheetObject(const librevenge::RVNGBinaryData ...@@ -39,7 +39,7 @@ static bool handleEmbeddedMWAWSpreadsheetObject(const librevenge::RVNGBinaryData
return MWAWDocument::decodeSpreadsheet(data, &exporter); return MWAWDocument::decodeSpreadsheet(data, &exporter);
} }
bool MWAWDrawImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) bool MWAWDrawImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &)
{ {
return MWAWDocument::MWAW_R_OK == MWAWDocument::parse(&rInput, &rGenerator); return MWAWDocument::MWAW_R_OK == MWAWDocument::parse(&rInput, &rGenerator);
} }
......
writerperfect/source/draw/MWAWDrawImportFilter.hxx
Dosyayı görüntüle @ 10572dbf
...@@ -34,7 +34,7 @@ public: ...@@ -34,7 +34,7 @@ public:
private: private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE; virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE; virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &) SAL_OVERRIDE;
virtual void doRegisterHandlers(OdgGenerator &rGenerator) SAL_OVERRIDE; virtual void doRegisterHandlers(OdgGenerator &rGenerator) SAL_OVERRIDE;
}; };
......
writerperfect/source/draw/PageMakerImportFilter.cxx
Dosyayı görüntüle @ 10572dbf
...@@ -25,7 +25,7 @@ using com::sun::star::uno::Sequence; ...@@ -25,7 +25,7 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext; using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface; using com::sun::star::uno::XInterface;
bool PageMakerImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) bool PageMakerImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &)
{ {
return libpagemaker::PMDocument::parse(&rInput, &rGenerator); return libpagemaker::PMDocument::parse(&rInput, &rGenerator);
} }
......
writerperfect/source/draw/PageMakerImportFilter.hxx
Dosyayı görüntüle @ 10572dbf
...@@ -31,7 +31,7 @@ public: ...@@ -31,7 +31,7 @@ public:
private: private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE; virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE; virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &) SAL_OVERRIDE;
}; };
OUString PageMakerImportFilter_getImplementationName() OUString PageMakerImportFilter_getImplementationName()
......
writerperfect/source/draw/VisioImportFilter.cxx
Dosyayı görüntüle @ 10572dbf
...@@ -23,7 +23,7 @@ using com::sun::star::uno::Sequence; ...@@ -23,7 +23,7 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext; using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface; using com::sun::star::uno::XInterface;
bool VisioImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) bool VisioImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &)
{ {
return libvisio::VisioDocument::parse(&rInput, &rGenerator); return libvisio::VisioDocument::parse(&rInput, &rGenerator);
} }
......
writerperfect/source/draw/VisioImportFilter.hxx
Dosyayı görüntüle @ 10572dbf
...@@ -31,7 +31,7 @@ public: ...@@ -31,7 +31,7 @@ public:
private: private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE; virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE; virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &) SAL_OVERRIDE;
}; };
OUString VisioImportFilter_getImplementationName() OUString VisioImportFilter_getImplementationName()
......
writerperfect/source/draw/WPGImportFilter.cxx
Dosyayı görüntüle @ 10572dbf
...@@ -30,7 +30,7 @@ using com::sun::star::uno::Sequence; ...@@ -30,7 +30,7 @@ using com::sun::star::uno::Sequence;
using com::sun::star::uno::XComponentContext; using com::sun::star::uno::XComponentContext;
using com::sun::star::uno::XInterface; using com::sun::star::uno::XInterface;
bool WPGImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) bool WPGImportFilter::doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &)
{ {
return libwpg::WPGraphics::parse(&rInput, &rGenerator); return libwpg::WPGraphics::parse(&rInput, &rGenerator);
} }
......
writerperfect/source/draw/WPGImportFilter.hxx
Dosyayı görüntüle @ 10572dbf
...@@ -36,7 +36,7 @@ public: ...@@ -36,7 +36,7 @@ public:
private: private:
virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE; virtual bool doDetectFormat(librevenge::RVNGInputStream &rInput, OUString &rTypeName) SAL_OVERRIDE;
virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator) SAL_OVERRIDE; virtual bool doImportDocument(librevenge::RVNGInputStream &rInput, librevenge::RVNGDrawingInterface &rGenerator, utl::MediaDescriptor &) SAL_OVERRIDE;
}; };
OUString WPGImportFilter_getImplementationName() OUString WPGImportFilter_getImplementationName()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment