[Libreoffice-commits] .: package/source
package/source/manifest/ManifestExport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0c558610bdc5b9abc8e81b45e545983cc3a79670 Author: Udo Schuermann u...@ringlord.com Date: Mon Apr 16 21:48:01 2012 +0100 a tiny spelling mistak diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx index 40786db..8bbb4ce 100644 --- a/package/source/manifest/ManifestExport.cxx +++ b/package/source/manifest/ManifestExport.cxx @@ -302,7 +302,7 @@ ManifestExport::ManifestExport( uno::Reference xml::sax::XDocumentHandler xHa sEncAlgName = sBlowfish_Name; } else -throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX Unexpecte encryption algorithm is provided! ) ), uno::Reference uno::XInterface () ); +throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX Unexpected encryption algorithm is provided! ) ), uno::Reference uno::XInterface () ); pNewAttrList-AddAttribute ( sAlgorithmNameAttribute, sCdataAttribute, sEncAlgName ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: package/source zlib/zlib-1.2.5.patch
package/source/zipapi/Deflater.cxx |8
package/source/zipapi/Inflater.cxx |4 ++--
zlib/zlib-1.2.5.patch | 15 ---
3 files changed, 6 insertions(+), 21 deletions(-)
New commits:
commit 39481744b199bed3a5f67f6ceee9c2e01595f2af
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 16 11:12:28 2012 +
drop Z_PREFIX from internal zlib, makes building clucene much easier
diff --git a/package/source/zipapi/Deflater.cxx
b/package/source/zipapi/Deflater.cxx
index 5aab0c5..0b5a7fe 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -93,7 +93,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence sal_Int8
rBuffer, sal_Int
pStream-avail_in = nLength;
pStream-avail_out = nNewLength;
-#if defined SYSTEM_ZLIB || !defined Z_PREFIX
+#if !defined Z_PREFIX
nResult = deflateParams(pStream, nLevel, nStrategy);
#else
nResult = z_deflateParams(pStream, nLevel, nStrategy);
@@ -119,7 +119,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence
sal_Int8 rBuffer, sal_Int
pStream-avail_in = nLength;
pStream-avail_out = nNewLength;
-#if defined SYSTEM_ZLIB || !defined Z_PREFIX
+#if !defined Z_PREFIX
nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
#else
nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
@@ -188,7 +188,7 @@ sal_Int32 SAL_CALL Deflater::getTotalOut( )
}
void SAL_CALL Deflater::reset( )
{
-#if defined SYSTEM_ZLIB || !defined Z_PREFIX
+#if !defined Z_PREFIX
deflateReset(pStream);
#else
z_deflateReset(pStream);
@@ -201,7 +201,7 @@ void SAL_CALL Deflater::end( )
{
if (pStream != NULL)
{
-#if defined SYSTEM_ZLIB || !defined Z_PREFIX
+#if !defined Z_PREFIX
deflateEnd(pStream);
#else
z_deflateEnd(pStream);
diff --git a/package/source/zipapi/Inflater.cxx
b/package/source/zipapi/Inflater.cxx
index 1bc9972..043c501 100644
--- a/package/source/zipapi/Inflater.cxx
+++ b/package/source/zipapi/Inflater.cxx
@@ -105,7 +105,7 @@ void SAL_CALL Inflater::end( )
{
if (pStream != NULL)
{
-#if defined SYSTEM_ZLIB || !defined Z_PREFIX
+#if !defined Z_PREFIX
inflateEnd(pStream);
#else
z_inflateEnd(pStream);
@@ -130,7 +130,7 @@ sal_Int32 Inflater::doInflateBytes (Sequence sal_Int8
rBuffer, sal_Int32 n
pStream-next_out = reinterpret_cast unsigned char* (
rBuffer.getArray() + nNewOffset );
pStream-avail_out = nNewLength;
-#if defined SYSTEM_ZLIB || !defined Z_PREFIX
+#if !defined Z_PREFIX
sal_Int32 nResult = ::inflate(pStream, Z_PARTIAL_FLUSH);
#else
sal_Int32 nResult = ::z_inflate(pStream, Z_PARTIAL_FLUSH);
diff --git a/zlib/zlib-1.2.5.patch b/zlib/zlib-1.2.5.patch
index 41ae0d4..7021a2c 100644
--- a/zlib/zlib-1.2.5.patch
+++ b/zlib/zlib-1.2.5.patch
@@ -69,18 +69,3 @@
+.INCLUDE : target.mk
+.INCLUDE : tg_wntx64.mk
+
misc/zlib-1.2.5/zconf.h2010-04-18 19:58:06.0 +0200
-+++ misc/build/zlib-1.2.5/zconf.h 2011-08-12 09:44:59.524936228 +0200
-@@ -14,6 +14,12 @@
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using ./configure --zprefix.
- */
-+/*
-+ * we need the prefix to get the same names as in 1.1.3
-+*/
-+
-+#define Z_PREFIX
-+
- #ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
-
- /* all linked symbols */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: package/source
package/source/zipapi/Deflater.cxx |8
package/source/zipapi/Inflater.cxx |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 372a0d505c722fd8b39cf4f65487e7f08049896b
Author: Caolán McNamara caol...@redhat.com
Date: Wed Feb 15 16:02:47 2012 +
these were surely meant to be Z_PREFIX not ZLIB_PREFIX
seeing as Z_PREFIX is what we set in our internal zlib
and one of these was ZLIB_PREFIXB anyway
diff --git a/package/source/zipapi/Deflater.cxx
b/package/source/zipapi/Deflater.cxx
index a6d7c45..5aab0c5 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -93,7 +93,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence sal_Int8
rBuffer, sal_Int
pStream-avail_in = nLength;
pStream-avail_out = nNewLength;
-#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
+#if defined SYSTEM_ZLIB || !defined Z_PREFIX
nResult = deflateParams(pStream, nLevel, nStrategy);
#else
nResult = z_deflateParams(pStream, nLevel, nStrategy);
@@ -119,7 +119,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence
sal_Int8 rBuffer, sal_Int
pStream-avail_in = nLength;
pStream-avail_out = nNewLength;
-#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
+#if defined SYSTEM_ZLIB || !defined Z_PREFIX
nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
#else
nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
@@ -188,7 +188,7 @@ sal_Int32 SAL_CALL Deflater::getTotalOut( )
}
void SAL_CALL Deflater::reset( )
{
-#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIXB
+#if defined SYSTEM_ZLIB || !defined Z_PREFIX
deflateReset(pStream);
#else
z_deflateReset(pStream);
@@ -201,7 +201,7 @@ void SAL_CALL Deflater::end( )
{
if (pStream != NULL)
{
-#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
+#if defined SYSTEM_ZLIB || !defined Z_PREFIX
deflateEnd(pStream);
#else
z_deflateEnd(pStream);
diff --git a/package/source/zipapi/Inflater.cxx
b/package/source/zipapi/Inflater.cxx
index 87e7a4b..1bc9972 100644
--- a/package/source/zipapi/Inflater.cxx
+++ b/package/source/zipapi/Inflater.cxx
@@ -105,7 +105,7 @@ void SAL_CALL Inflater::end( )
{
if (pStream != NULL)
{
-#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
+#if defined SYSTEM_ZLIB || !defined Z_PREFIX
inflateEnd(pStream);
#else
z_inflateEnd(pStream);
@@ -130,7 +130,7 @@ sal_Int32 Inflater::doInflateBytes (Sequence sal_Int8
rBuffer, sal_Int32 n
pStream-next_out = reinterpret_cast unsigned char* (
rBuffer.getArray() + nNewOffset );
pStream-avail_out = nNewLength;
-#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
+#if defined SYSTEM_ZLIB || !defined Z_PREFIX
sal_Int32 nResult = ::inflate(pStream, Z_PARTIAL_FLUSH);
#else
sal_Int32 nResult = ::z_inflate(pStream, Z_PARTIAL_FLUSH);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: package/source
package/source/zippackage/ZipPackageStream.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 47e38fb11f9d6e76aefbee75eaf25e4344d03a20
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Feb 12 14:29:55 2012 +0100
If we can have a few more information...
diff --git a/package/source/zippackage/ZipPackageStream.cxx
b/package/source/zippackage/ZipPackageStream.cxx
index b3db1c6..5cb6720 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -538,9 +538,10 @@ uno::Reference io::XInputStream SAL_CALL
ZipPackageStream::getInputStream()
OSL_FAIL( ZipException thrown );//rException.Message);
return uno::Reference io::XInputStream ();
}
-catch ( Exception )
+catch ( Exception ex )
{
OSL_FAIL( Exception is thrown during stream wrapping!\n );
+OSL_FAIL(OUStringToOString(ex.Message,
RTL_TEXTENCODING_UTF8).getStr());
return uno::Reference io::XInputStream ();
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: package/source
package/source/zipapi/ZipFile.cxx |8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) New commits: commit 82b71e04a1594755d345d227181642c491518e18 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Dec 15 12:30:13 2011 +0100 Revert Fix n#653688 This reverts commit 309f56174aca6adca879f70958892492361dac6e. It caused password-protected documents to no longer work and made sc_subsequent_filters_test's testPassword fail. diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 8317745..ef801f2 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -688,7 +688,7 @@ sal_Bool ZipFile::readLOC( ZipEntry rEntry ) // check basic local file header / entry consistency bBroken = rEntry.nVersion != nVersion -|| rEntry.nMethod != nHow +|| rEntry.nFlag != nFlag || rEntry.nTime != nTime || rEntry.nPathLen != nPathLen || !rEntry.sPath.equals( sLOCPath ); @@ -698,12 +698,6 @@ sal_Bool ZipFile::readLOC( ZipEntry rEntry ) bBroken = sal_True; } -// ignore bits 1 2 for normal deflate algo - they're purely informative -if( nHow != 8 nHow != 9 ) -bBroken = bBroken || rEntry.nFlag != nFlag; -else if( (rEntry.nFlag ~6L) != (nFlag ~6L) ) -bBroken = true; - if ( bBroken !bRecoveryMode ) throw ZipIOException( OUString( RTL_CONSTASCII_USTRINGPARAM( The stream seems to be broken! ) ), uno::Reference XInterface () ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: package/source
package/source/zipapi/ZipFile.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3091d423cd20db9980eb5ea6866b91157515f96d Author: Thorsten Behrens tbehr...@suse.com Date: Wed Dec 14 14:41:10 2011 +0100 Align comment with code for overly zealous check in Zip fix. diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 4fd8aea..8317745 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -686,7 +686,7 @@ sal_Bool ZipFile::readLOC( ZipEntry rEntry ) rEntry.sPath = sLOCPath; } -// the method can be reset for internal use so it is not checked +// check basic local file header / entry consistency bBroken = rEntry.nVersion != nVersion || rEntry.nMethod != nHow || rEntry.nTime != nTime ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
