diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2017-01-10 22:05:13 -0500 |
---|---|---|
committer | Kohei Yoshida <libreoffice@kohei.us> | 2017-01-11 14:43:57 +0000 |
commit | a544fd5fa233135f150b44c843a14be461952ecd (patch) | |
tree | 7bbe8bb6bc3c5324c024dfa64f174de38b03165a /package/source | |
parent | be7d0697b0e2d55ce01dcd4abec5d106115d8920 (diff) |
Remove unnecessary UNO-ness from ZipFile class.
This class is only used inside package module, and totally private
to the module.
Change-Id: Ib00e7066c22a74c0b16c8d6ecf72b99ac42682dd
Reviewed-on: https://gerrit.libreoffice.org/32945
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'package/source')
-rw-r--r-- | package/source/zipapi/ZipFile.cxx | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index da44e34aca8c..943fde17b38d 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -68,7 +68,6 @@ using ZipUtils::Inflater; /** This class is used to read entries from a zip file */ ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, const uno::Reference < XComponentContext > & rxContext, bool bInitialise ) - throw(IOException, ZipException, RuntimeException) : aGrabber(xInput) , aInflater( true ) , xStream(xInput) @@ -87,7 +86,6 @@ ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, const uno::Reference } ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, const uno::Reference < XComponentContext > & rxContext, bool bInitialise, bool bForceRecovery) - throw(IOException, ZipException, RuntimeException) : aGrabber(xInput) , aInflater( true ) , xStream(xInput) @@ -379,7 +377,6 @@ bool ZipFile::StaticFillData ( ::rtl::Reference< BaseEncryptionData > & rData, uno::Reference< XInputStream > ZipFile::StaticGetDataFromRawStream( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< XInputStream >& xStream, const ::rtl::Reference< EncryptionData > &rData ) - throw ( packages::WrongPasswordException, ZipIOException, RuntimeException ) { if ( !rData.is() ) throw ZipIOException("Encrypted stream without encryption data!" ); @@ -521,7 +518,7 @@ uno::Reference< XInputStream > ZipFile::createUnbufferedStream( return new XUnbufferedStream ( m_xContext, aMutexHolder, rEntry, xStream, rData, nStreamMode, bIsEncrypted, aMediaType, bRecoveryMode ); } -ZipEnumeration * SAL_CALL ZipFile::entries( ) +ZipEnumeration* ZipFile::entries() { return new ZipEnumeration ( aEntries ); } @@ -530,7 +527,6 @@ uno::Reference< XInputStream > SAL_CALL ZipFile::getInputStream( ZipEntry& rEntr const ::rtl::Reference< EncryptionData > &rData, bool bIsEncrypted, const rtl::Reference<SotMutexHolder>& aMutexHolder ) - throw(IOException, ZipException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -558,10 +554,6 @@ uno::Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry const ::rtl::Reference< EncryptionData > &rData, bool bIsEncrypted, const rtl::Reference<SotMutexHolder>& aMutexHolder ) - throw ( packages::WrongPasswordException, - IOException, - ZipException, - RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -598,7 +590,6 @@ uno::Reference< XInputStream > SAL_CALL ZipFile::getRawData( ZipEntry& rEntry, const ::rtl::Reference< EncryptionData >& rData, bool bIsEncrypted, const rtl::Reference<SotMutexHolder>& aMutexHolder ) - throw(IOException, ZipException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -613,10 +604,6 @@ uno::Reference< XInputStream > SAL_CALL ZipFile::getWrappedRawStream( const ::rtl::Reference< EncryptionData >& rData, const OUString& aMediaType, const rtl::Reference<SotMutexHolder>& aMutexHolder ) - throw ( packages::NoEncryptionException, - IOException, - ZipException, - RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -630,7 +617,6 @@ uno::Reference< XInputStream > SAL_CALL ZipFile::getWrappedRawStream( } bool ZipFile::readLOC( ZipEntry &rEntry ) - throw(IOException, ZipException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -700,8 +686,7 @@ bool ZipFile::readLOC( ZipEntry &rEntry ) return true; } -sal_Int32 ZipFile::findEND( ) - throw(IOException, ZipException, RuntimeException) +sal_Int32 ZipFile::findEND() { // this method is called in constructor only, no need for mutex sal_Int32 nLength, nPos, nEnd; @@ -743,7 +728,6 @@ sal_Int32 ZipFile::findEND( ) } sal_Int32 ZipFile::readCEN() - throw(IOException, ZipException, RuntimeException) { // this method is called in constructor only, no need for mutex sal_Int32 nCenPos = -1, nEndPos, nLocPos; @@ -861,7 +845,6 @@ sal_Int32 ZipFile::readCEN() } void ZipFile::recover() - throw(IOException, ZipException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); |