From fd00bd0f69676659bb43bcc85d8ad5fd21e5de4c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 18 May 2017 12:38:23 +0200 Subject: loplugin:unusedfields make it a little smarter in dealing with fields that are smart pointers Change-Id: I44072105170882dc29fb19558f1065cffc7e5f11 Reviewed-on: https://gerrit.libreoffice.org/37751 Tested-by: Jenkins Reviewed-by: Noel Grandin --- filter/source/msfilter/msdffimp.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'filter') diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 4dd1519bd74f..518ff24dbab9 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5594,7 +5594,6 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_, nGroupShapeFlags(0), // ensure initialization here, as some corrupted // files may yield to this being uninitialized maBaseURL( rBaseURL ), - mnCurMaxShapeId(0), mnIdClusters(0), rStCtrl( rStCtrl_ ), pStData( pStData_ ), @@ -5638,7 +5637,6 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const OUString& rBaseURL ) nBLIPCount( USHRT_MAX ), // initialize with error, since we first have to check nGroupShapeFlags(0), maBaseURL( rBaseURL ), - mnCurMaxShapeId(0), mnIdClusters(0), rStCtrl( rStCtrl_ ), pStData( nullptr ), @@ -5716,7 +5714,8 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL ) if (bOk && SeekToRec(rStCtrl, DFF_msofbtDgg, aRecHd.GetRecEndFilePos(), &aDggAtomHd)) { aDggAtomHd.SeekToContent( rStCtrl ); - rStCtrl.ReadUInt32( mnCurMaxShapeId ) + sal_uInt32 nCurMaxShapeId; + rStCtrl.ReadUInt32( nCurMaxShapeId ) .ReadUInt32( mnIdClusters ) .ReadUInt32( nDummy ) .ReadUInt32( nDummy ); // nDrawingsSaved -- cgit