From fada813d5db2be370638d182e9f3b0dcd89fa081 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 9 Sep 2018 13:36:33 +0200 Subject: loplugin:simplifyconstruct in l10ntools..package Change-Id: I8dba8ef1e7455af1e55bbd6086b49c0606bf4927 Reviewed-on: https://gerrit.libreoffice.org/60212 Tested-by: Jenkins Reviewed-by: Noel Grandin --- package/source/xstor/ocompinstream.cxx | 2 -- package/source/xstor/ohierarchyholder.hxx | 6 ++---- package/source/xstor/switchpersistencestream.cxx | 2 -- package/source/zipapi/Inflater.cxx | 3 +-- package/source/zippackage/zipfileaccess.cxx | 1 - 5 files changed, 3 insertions(+), 11 deletions(-) (limited to 'package') diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx index efa4122e2cd1..af87464d2bf3 100644 --- a/package/source/xstor/ocompinstream.cxx +++ b/package/source/xstor/ocompinstream.cxx @@ -37,7 +37,6 @@ OInputCompStream::OInputCompStream( OWriteStream_Impl& aImpl, : m_pImpl( &aImpl ) , m_xMutex( m_pImpl->m_xMutex ) , m_xStream( xStream ) -, m_pInterfaceContainer( nullptr ) , m_aProperties( aProps ) , m_bDisposed( false ) , m_nStorageType( nStorageType ) @@ -55,7 +54,6 @@ OInputCompStream::OInputCompStream( uno::Reference < io::XInputStream > const & : m_pImpl( nullptr ) , m_xMutex( new comphelper::RefCountedMutex ) , m_xStream( xStream ) -, m_pInterfaceContainer( nullptr ) , m_aProperties( aProps ) , m_bDisposed( false ) , m_nStorageType( nStorageType ) diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx index 317a4d9b329c..c50a00358b1b 100644 --- a/package/source/xstor/ohierarchyholder.hxx +++ b/package/source/xstor/ohierarchyholder.hxx @@ -55,13 +55,11 @@ struct OHierarchyElement_Impl : public cppu::WeakImplHelper< css::embed::XTransa public: explicit OHierarchyElement_Impl( const css::uno::Reference< css::embed::XStorage >& xStorage ) - : m_rParent( nullptr ) - , m_xOwnStorage( xStorage ) + : m_xOwnStorage( xStorage ) {} explicit OHierarchyElement_Impl( const css::uno::WeakReference< css::embed::XStorage >& xWeakStorage ) - : m_rParent( nullptr ) - , m_xWeakOwnStorage( xWeakStorage ) + : m_xWeakOwnStorage( xWeakStorage ) {} void Commit(); diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx index b85be26f7eb6..7eac83cbf708 100644 --- a/package/source/xstor/switchpersistencestream.cxx +++ b/package/source/xstor/switchpersistencestream.cxx @@ -64,7 +64,6 @@ SwitchablePersistenceStream::SwitchablePersistenceStream( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< io::XStream >& xStream ) : m_xContext( xContext ) -, m_pStreamData( nullptr ) { SwitchPersistenceTo( xStream ); } @@ -73,7 +72,6 @@ SwitchablePersistenceStream::SwitchablePersistenceStream( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< io::XInputStream >& xInputStream ) : m_xContext( xContext ) -, m_pStreamData( nullptr ) { SwitchPersistenceTo( xInputStream ); } diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index 24a3b23e3156..9abea5bfe977 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -31,8 +31,7 @@ Inflater::Inflater(bool bNoWrap) bNeedDict(false), nOffset(0), nLength(0), - nLastInflateError(0), - pStream(nullptr) + nLastInflateError(0) { pStream.reset(new z_stream); /* memset to 0 to set zalloc/opaque etc */ diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index f585d53e9297..70b8d3f7a96f 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star; OZipFileAccess::OZipFileAccess( const uno::Reference< uno::XComponentContext >& rxContext ) : m_aMutexHolder( new comphelper::RefCountedMutex ) , m_xContext( rxContext ) -, m_pListenersContainer( nullptr ) , m_bDisposed( false ) , m_bOwnContent( false ) { -- cgit