From e3a31fcca771432a38e4c2e7cc4c4c6c1c157ee9 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 23 Dec 2015 16:41:52 +0200 Subject: loplugin:unusedfields Change-Id: I979592adb978c3757a1e54615021ee424a2e02bf Reviewed-on: https://gerrit.libreoffice.org/20892 Tested-by: Jenkins Reviewed-by: Noel Grandin --- package/inc/ZipFile.hxx | 4 +--- package/source/zipapi/ZipFile.cxx | 3 +-- package/source/zippackage/ZipPackage.cxx | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'package') diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index f0ec8dbe0414..d49fcab233bc 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -62,7 +62,6 @@ protected: css::uno::Reference < css::io::XInputStream > xStream; css::uno::Reference < css::io::XSeekable > xSeek; const css::uno::Reference < css::uno::XComponentContext > m_xContext; - css::uno::Reference < css::ucb::XProgressHandler > xProgressHandler; bool bRecoveryMode; @@ -94,8 +93,7 @@ public: ZipFile( css::uno::Reference < css::io::XInputStream > &xInput, const css::uno::Reference < css::uno::XComponentContext > &rxContext, bool bInitialise, - bool bForceRecover, - css::uno::Reference < css::ucb::XProgressHandler > xProgress + bool bForceRecover ) throw(css::io::IOException, css::packages::zip::ZipException, css::uno::RuntimeException); diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 41d77fbbd317..236df7192364 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -86,14 +86,13 @@ ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, const uno::Reference } } -ZipFile::ZipFile( uno::Reference < XInputStream > &xInput, const uno::Reference < XComponentContext > & rxContext, bool bInitialise, bool bForceRecovery, uno::Reference < XProgressHandler > xProgress ) +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) , xSeek(xInput, UNO_QUERY) , m_xContext ( rxContext ) -, xProgressHandler( xProgress ) , bRecoveryMode( bForceRecovery ) { if (bInitialise) diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index d19452d96a49..8107ae4e1998 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -741,7 +741,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) OUString message; try { - m_pZipFile = new ZipFile ( m_xContentStream, m_xContext, true, m_bForceRecovery, xProgressHandler ); + m_pZipFile = new ZipFile ( m_xContentStream, m_xContext, true, m_bForceRecovery ); getZipFileContents(); } catch ( IOException & e ) -- cgit