mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ZipOutputStream: No need to explicitly set default values

Browse Source 
Change-Id: Ia3a20e0692e658d847e1b825fc97e32ac8a1854b
This commit is contained in:
Matúš Kukan
2014-10-09 13:15:22 +02:00
parent 9f495d128e
commit ae0756d826
3 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/inc/ZipOutputStream.hxx
View File

@@ -52,7 +52,7 @@ protected:
CRC32 m_aCRC; CRC32 m_aCRC;
ByteChucker m_aChucker; ByteChucker m_aChucker;
ZipEntry *m_pCurrentEntry; ZipEntry *m_pCurrentEntry;
sal_Int16 m_nMethod, m_nLevel, m_nDigested; sal_Int16 m_nDigested;
bool m_bFinished, m_bEncryptCurrentEntry; bool m_bFinished, m_bEncryptCurrentEntry;
ZipPackageStream* m_pCurrentStream; ZipPackageStream* m_pCurrentStream;
@@ -69,10 +69,6 @@ public:
throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
// XZipOutputStream interfaces // XZipOutputStream interfaces
void SAL_CALL setMethod( sal_Int32 nNewMethod )
throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL setLevel( sal_Int32 nNewLevel )
throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL putNextEntry( ZipEntry& rEntry, void SAL_CALL putNextEntry( ZipEntry& rEntry,
ZipPackageStream* pStream, ZipPackageStream* pStream,
bool bEncrypt = false ) bool bEncrypt = false )

15
package/source/zipapi/ZipOutputStream.cxx
View File

@@ -45,8 +45,6 @@ ZipOutputStream::ZipOutputStream( const uno::Reference< uno::XComponentContext >
, m_aDeflater(DEFAULT_COMPRESSION, true) , m_aDeflater(DEFAULT_COMPRESSION, true)
, m_aChucker(xOStream) , m_aChucker(xOStream)
, m_pCurrentEntry(NULL) , m_pCurrentEntry(NULL)
, m_nMethod(DEFLATED)
, m_nLevel(0)
, m_nDigested(0) , m_nDigested(0)
, m_bFinished(false) , m_bFinished(false)
, m_bEncryptCurrentEntry(false) , m_bEncryptCurrentEntry(false)
@@ -60,17 +58,6 @@ ZipOutputStream::~ZipOutputStream( void )
delete m_aZipList[i]; delete m_aZipList[i];
} }
void SAL_CALL ZipOutputStream::setMethod( sal_Int32 nNewMethod )
throw(RuntimeException)
{
m_nMethod = static_cast < sal_Int16 > (nNewMethod);
}
void SAL_CALL ZipOutputStream::setLevel( sal_Int32 nNewLevel )
throw(RuntimeException)
{
m_aDeflater.setLevel( nNewLevel);
}
void SAL_CALL ZipOutputStream::putNextEntry( ZipEntry& rEntry, void SAL_CALL ZipOutputStream::putNextEntry( ZipEntry& rEntry,
ZipPackageStream* pStream, ZipPackageStream* pStream,
bool bEncrypt) bool bEncrypt)
@@ -81,7 +68,7 @@ void SAL_CALL ZipOutputStream::putNextEntry( ZipEntry& rEntry,
if (rEntry.nTime == -1) if (rEntry.nTime == -1)
rEntry.nTime = getCurrentDosTime(); rEntry.nTime = getCurrentDosTime();
if (rEntry.nMethod == -1) if (rEntry.nMethod == -1)
rEntry.nMethod = m_nMethod; rEntry.nMethod = DEFLATED;
rEntry.nVersion = 20; rEntry.nVersion = 20;
rEntry.nFlag = 1 << 11; rEntry.nFlag = 1 << 11;
if (rEntry.nSize == -1 || rEntry.nCompressedSize == -1 || if (rEntry.nSize == -1 || rEntry.nCompressedSize == -1 ||

3
package/source/zippackage/ZipPackage.cxx
View File

@@ -1139,9 +1139,6 @@ uno::Reference< io::XInputStream > ZipPackage::writeTempFile()
// Hand it to the ZipOutputStream: // Hand it to the ZipOutputStream:
ZipOutputStream aZipOut( m_xContext, xTempOut ); ZipOutputStream aZipOut( m_xContext, xTempOut );
aZipOut.setMethod( DEFLATED );
aZipOut.setLevel( DEFAULT_COMPRESSION );
try try
{ {
if ( m_nFormat == embed::StorageFormats::PACKAGE ) if ( m_nFormat == embed::StorageFormats::PACKAGE )