summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 05:14:28 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 05:14:28 +0000
commit4d7f01e620da1fb301b67cbb5d5d5e74c7ea0689 (patch)
tree4d7c39a4f53afd3abc2f4d2f5b593aef8c9bd52e /package
parente8d9b366bdbd5073e4ac80b4d3509ecf34b35de2 (diff)
INTEGRATION: CWS warnings01 (1.13.216); FILE MERGED
2005/09/23 03:40:02 sb 1.13.216.2: RESYNC: (1.13-1.14); FILE MERGED 2005/09/15 15:28:04 abi 1.13.216.1: #i53898# warning free
Diffstat (limited to 'package')
-rw-r--r--package/source/zippackage/ZipPackageBuffer.cxx13
1 files changed, 6 insertions, 7 deletions
diff --git a/package/source/zippackage/ZipPackageBuffer.cxx b/package/source/zippackage/ZipPackageBuffer.cxx
index 20c1f184870b..aba836f2d05a 100644
--- a/package/source/zippackage/ZipPackageBuffer.cxx
+++ b/package/source/zippackage/ZipPackageBuffer.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: ZipPackageBuffer.cxx,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 16:17:11 $
+ * last change: $Author: hr $ $Date: 2006-06-20 06:14:28 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -44,16 +44,16 @@ using com::sun::star::lang::IllegalArgumentException;
ZipPackageBuffer::ZipPackageBuffer(sal_Int64 nNewBufferSize )
: m_nBufferSize (nNewBufferSize)
-, m_bMustInitBuffer ( sal_True )
-, m_nCurrent(0)
, m_nEnd(0)
+, m_nCurrent(0)
+, m_bMustInitBuffer ( sal_True )
{
}
ZipPackageBuffer::ZipPackageBuffer(Sequence < sal_Int8 > &nNewBuffer )
: m_aBuffer ( nNewBuffer )
-, m_bMustInitBuffer ( sal_False )
-, m_nCurrent( 0 )
, m_nEnd ( nNewBuffer.getLength() )
+, m_nCurrent( 0 )
+, m_bMustInitBuffer ( sal_False )
{
}
ZipPackageBuffer::~ZipPackageBuffer(void)
@@ -104,7 +104,6 @@ void SAL_CALL ZipPackageBuffer::writeBytes( const Sequence< sal_Int8 >& aData )
throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException)
{
sal_Int64 nDataLen = aData.getLength(), nCombined = m_nEnd + nDataLen;
- const sal_Int8 *pData = aData.getConstArray();
if ( nCombined > m_nBufferSize)
{