[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 4 commits - configure.ac writerperfect/qa writerperfect/source

[David Tardon]

 configure.ac                                                              |    2 
 writerperfect/qa/unit/data/writer/libmwaw/indeterminate/GreatWorks_v2.hqx |  180 ++++++++++
 writerperfect/qa/unit/data/writer/libmwaw/pass/GreatWorks_v2.hqx          |  180 ----------
 writerperfect/source/common/WPXSvInputStream.cxx                          |    6 
 writerperfect/source/writer/MSWorksImportFilter.cxx                       |    2 
 writerperfect/source/writer/WordPerfectImportFilter.cxx                   |    8 
 6 files changed, 189 insertions(+), 189 deletions(-)

New commits:
commit a16adc1d7d9be7434f6629b5695c69042136af0a
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jun 3 10:13:32 2014 +0200

    do not disable complete test, just the one file
    
    Change-Id: I1acccba8c2ef44d76c13eadb97d03119f08baa1d
    (cherry picked from commit 7b91c6aaf9e0ef09ba31dee564dcee4def545549)

diff --git a/writerperfect/qa/unit/data/writer/libmwaw/indeterminate/.gitignore b/writerperfect/qa/unit/data/writer/libmwaw/indeterminate/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/writerperfect/qa/unit/data/writer/libmwaw/pass/GreatWorks_v2.hqx b/writerperfect/qa/unit/data/writer/libmwaw/indeterminate/GreatWorks_v2.hqx
similarity index 100%
rename from writerperfect/qa/unit/data/writer/libmwaw/pass/GreatWorks_v2.hqx
rename to writerperfect/qa/unit/data/writer/libmwaw/indeterminate/GreatWorks_v2.hqx
commit f20b6d26f728d863f62b61af251e160499972953
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jun 3 10:11:53 2014 +0200

    drop useless const_cast
    
    Change-Id: Ie5e6f519a511931b383b6131a4a188abb3396946
    (cherry picked from commit d3ddcbaeef9648cff78069b8ed443d7d3d611546)

diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index e2bcdc8..185ae17 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -439,7 +439,7 @@ private:
     bool mbCheckedZip;
 public:
     sal_Int64 mnLength;
-    unsigned char *mpReadBuffer;
+    const unsigned char *mpReadBuffer;
     unsigned long mnReadBufferLength;
     unsigned long mnReadBufferPos;
 };
@@ -865,7 +865,7 @@ const unsigned char *WPXSvInputStream::read(unsigned long numBytes, unsigned lon
         mpImpl->mnReadBufferLength = numBytes;
 
     unsigned long tmpNumBytes(0);
-    mpImpl->mpReadBuffer = const_cast<unsigned char*>(mpImpl->read(mpImpl->mnReadBufferLength, tmpNumBytes));
+    mpImpl->mpReadBuffer = mpImpl->read(mpImpl->mnReadBufferLength, tmpNumBytes);
     if (tmpNumBytes != mpImpl->mnReadBufferLength)
         mpImpl->mnReadBufferLength = tmpNumBytes;
 
commit c5b6eb836fdcc273a50ec4fc997eec61c8b79091
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jun 3 10:00:23 2014 +0200

    drop useless const_cast
    
    Change-Id: I8a14faf56303b986c3e6c8e9bec53210ae86fc87
    (cherry picked from commit 9533611f410dd36950c69a45fb6abe7e8760b281)

diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index b5786bf..e2bcdc8 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -876,7 +876,7 @@ const unsigned char *WPXSvInputStream::read(unsigned long numBytes, unsigned lon
     numBytesRead = numBytes;
 
     mpImpl->mnReadBufferPos += numBytesRead;
-    return const_cast<const unsigned char *>(mpImpl->mpReadBuffer);
+    return mpImpl->mpReadBuffer;
 }
 
 long WPXSvInputStream::tell()
commit d7217e91ed6f611e01532883b2b2363c21b791cd
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jun 3 09:59:10 2014 +0200

    getDataStream() returns non-const ptr now
    
    Change-Id: I6d1e811622cda61575464df8e4036b388a4ab706
    (cherry picked from commit 1031dba9e205a80de5011931b52c628881f62372)

diff --git a/configure.ac b/configure.ac
index 1b60e74..27070ad 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 2d253fb..9217cc6 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 48190ef..7804db8 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());