diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-03-17 16:55:49 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-03-17 16:55:49 +0100 |
| commit | 4734bc29ff6c0c7ff1b003bbba213671b824c1fc (patch) | |
| tree | 2c46b5092761f62a5acba94c25c3ab93ae85fdeb | |
| parent | c273c5ba84a438a6a0aa40ccb65914412f8f5993 (diff) | |
mav60: #164341# fix problems with the new implementation
| -rw-r--r-- | package/source/zipapi/XUnbufferedStream.cxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/util/xsec_xmlsec.component | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx index e633ea8a4..b66cfaf8f 100644 --- a/package/source/zipapi/XUnbufferedStream.cxx +++ b/package/source/zipapi/XUnbufferedStream.cxx @@ -291,7 +291,7 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa if ( mbCheckCRC && ( !mbRawStream || mbWrappedRaw ) ) { - if ( m_xCipherContext.is() && !mbWrappedRaw ) + if ( !m_xCipherContext.is() && !mbWrappedRaw ) maCRC.update( aData ); #if 0 diff --git a/xmlsecurity/util/xsec_xmlsec.component b/xmlsecurity/util/xsec_xmlsec.component index 3471ba83f..df4c2a7b2 100644 --- a/xmlsecurity/util/xsec_xmlsec.component +++ b/xmlsecurity/util/xsec_xmlsec.component @@ -33,8 +33,6 @@ </implementation> <implementation name="com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl"> <service name="com.sun.star.xml.crypto.NSSInitializer"/> - </implementation> - <implementation name="com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl"> <service name="com.sun.star.xml.crypto.SEInitializer"/> </implementation> <implementation name="com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"> |