mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

getDataStream() returns non-const ptr now

Browse Source 
Change-Id: I6d1e811622cda61575464df8e4036b388a4ab706
This commit is contained in:
David Tardon
2014-06-03 09:59:10 +02:00
parent e2d53032f4
commit 1031dba9e2
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -7696,7 +7696,7 @@ AS_IF([test "$COM" = "MSC"],
[librevenge_libdir="${WORKDIR}/LinkTarget/Library"], [librevenge_libdir="${WORKDIR}/LinkTarget/Library"],
[librevenge_libdir="${WORKDIR}/UnpackedTarball/librevenge/src/lib/.libs"] [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 ===================================================================
dnl Check for system libe-book dnl Check for system libe-book

2
writerperfect/source/writer/MSWorksImportFilter.cxx
View File

@@ -28,7 +28,7 @@ static bool handleEmbeddedWKSObject(const librevenge::RVNGBinaryData &data, OdfD
{ {
OdsGenerator exporter; OdsGenerator exporter;
exporter.addDocumentHandler(pHandler, streamType); 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 ) bool MSWorksImportFilter::doImportDocument( librevenge::RVNGInputStream &rInput, const rtl::OUString &, librevenge::RVNGTextInterface &rGenerator )

8
writerperfect/source/writer/WordPerfectImportFilter.cxx
View File

@@ -65,23 +65,23 @@ static bool handleEmbeddedWPGObject(const librevenge::RVNGBinaryData &data, OdfD
libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT; 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; 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) static bool handleEmbeddedWPGImage(const librevenge::RVNGBinaryData &input, librevenge::RVNGBinaryData &output)
{ {
libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT; 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; fileFormat = libwpg::WPG_WPG1;
librevenge::RVNGStringVector svgOutput; librevenge::RVNGStringVector svgOutput;
librevenge::RVNGSVGDrawingGenerator aSVGGenerator(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; return false;
assert(1 == svgOutput.size()); assert(1 == svgOutput.size());