diff options
| author | David Tardon <dtardon@redhat.com> | 2014-06-03 09:59:10 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-06-03 10:14:42 +0200 |
| commit | d7217e91ed6f611e01532883b2b2363c21b791cd (patch) | |
| tree | 220607745444bc633bb3b75a34f81ede1a6d793d | |
| parent | 314d1059bfdfb3f600d94e40049b3d0f130283be (diff) | |
getDataStream() returns non-const ptr now
Change-Id: I6d1e811622cda61575464df8e4036b388a4ab706
(cherry picked from commit 1031dba9e205a80de5011931b52c628881f62372)
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | writerperfect/source/writer/MSWorksImportFilter.cxx | 2 | ||||
| -rw-r--r-- | writerperfect/source/writer/WordPerfectImportFilter.cxx | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 1b60e7421815..27070ad76c64 100644 --- a/configure.ac +++ b/configure.ac @@ -7704,7 +7704,7 @@ AS_IF([test "$COM" = "MSC"], [librevenge_libdir="${WORKDIR}/LinkTarget/Library"], [librevenge_libdir="${WORKDIR}/UnpackedTarball/librevenge/src/lib/.libs"] ) -libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir} -lrevenge-0.0"]) +libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir} -lrevenge-0.0"]) dnl =================================================================== dnl Check for system libe-book diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index 2d253fbf7cd4..9217cc638e44 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -28,7 +28,7 @@ static bool handleEmbeddedWKSObject(const librevenge::RVNGBinaryData &data, OdfD { OdsGenerator exporter; exporter.addDocumentHandler(pHandler, streamType); - return libwps::WPSDocument::parse(const_cast<librevenge::RVNGInputStream *>(data.getDataStream()), &exporter)==libwps::WPS_OK; + return libwps::WPSDocument::parse(data.getDataStream(), &exporter)==libwps::WPS_OK; } bool MSWorksImportFilter::doImportDocument( librevenge::RVNGInputStream &rInput, const rtl::OUString &, librevenge::RVNGTextInterface &rGenerator ) diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index 48190ef49b41..7804db8505b6 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -65,23 +65,23 @@ static bool handleEmbeddedWPGObject(const librevenge::RVNGBinaryData &data, OdfD libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT; - if (!libwpg::WPGraphics::isSupported(const_cast<librevenge::RVNGInputStream *>(data.getDataStream()))) + if (!libwpg::WPGraphics::isSupported(data.getDataStream())) fileFormat = libwpg::WPG_WPG1; - return libwpg::WPGraphics::parse(const_cast<librevenge::RVNGInputStream *>(data.getDataStream()), &exporter, fileFormat); + return libwpg::WPGraphics::parse(data.getDataStream(), &exporter, fileFormat); } static bool handleEmbeddedWPGImage(const librevenge::RVNGBinaryData &input, librevenge::RVNGBinaryData &output) { libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT; - if (!libwpg::WPGraphics::isSupported(const_cast<librevenge::RVNGInputStream *>(input.getDataStream()))) + if (!libwpg::WPGraphics::isSupported(input.getDataStream())) fileFormat = libwpg::WPG_WPG1; librevenge::RVNGStringVector svgOutput; librevenge::RVNGSVGDrawingGenerator aSVGGenerator(svgOutput, ""); - if (!libwpg::WPGraphics::parse(const_cast<librevenge::RVNGInputStream *>(input.getDataStream()), &aSVGGenerator, fileFormat)) + if (!libwpg::WPGraphics::parse(input.getDataStream(), &aSVGGenerator, fileFormat)) return false; assert(1 == svgOutput.size()); |