[Libreoffice-commits] .: package/source
David Tardon
dtardon at kemper.freedesktop.org
Tue Mar 29 04:29:12 PDT 2011
package/source/zippackage/ZipPackageFolder.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2cf272eea8db2b78f7822f522622b0a16a91301e
Author: David Tardon <dtardon at redhat.com>
Date: Tue Mar 29 13:28:59 2011 +0200
WaE: parentheses around '&&' within '||'
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index e6f2f12..c412af1 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -412,7 +412,7 @@ bool ZipPackageFolder::saveChild( const OUString &rShortName, const ContentInfo
if ( !bToBeCompressed || bRawStream )
{
// The raw stream can neither be encrypted nor connected
- OSL_ENSURE( !bRawStream || !bToBeCompressed && !bToBeEncrypted, "The stream is already encrypted!\n" );
+ OSL_ENSURE( !bRawStream || !(bToBeCompressed || bToBeEncrypted), "The stream is already encrypted!\n" );
xSeek->seek ( bRawStream ? rInfo.pStream->GetMagicalHackPos() : 0 );
ImplSetStoredData ( *pTempEntry, xStream );
More information about the Libreoffice-commits
mailing list