diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-13 08:22:37 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-13 14:46:53 +0200 |
commit | 04112bce506c60254cb1cb8536f942c8adb5c7d6 (patch) | |
tree | 43b63df6f5b5eeb89abe70094b415ddfed152a9a /filter | |
parent | 8feca893a902abe3c238403f0a1f59a24fb24926 (diff) |
loplugin:sequentialassign in filter..fpicker
Change-Id: I4ba0e1e982897bd570612f6cda8ba1e6a9fa5dbd
Reviewed-on: https://gerrit.libreoffice.org/70700
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/config/cache/filtercache.cxx | 9 | ||||
-rw-r--r-- | filter/source/graphicfilter/idxf/dxf2mtf.cxx | 3 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 3 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 3 | ||||
-rw-r--r-- | filter/source/svg/svgexport.cxx | 3 | ||||
-rw-r--r-- | filter/source/t602/t602filter.cxx | 4 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 3 |
7 files changed, 9 insertions, 19 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index f717f109a26f..29c717491588 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -549,8 +549,7 @@ void FilterCache::addStatePropsToItem( EItemType eType, void FilterCache::removeStatePropsFromItem(CacheItem& rItem) { - CacheItem::iterator pIt; - pIt = rItem.find(PROPNAME_FINALIZED); + CacheItem::iterator pIt = rItem.find(PROPNAME_FINALIZED); if (pIt != rItem.end()) rItem.erase(pIt); pIt = rItem.find(PROPNAME_MANDATORY); @@ -1575,8 +1574,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: { css::uno::Reference< css::beans::XMultiPropertySet > xPropSet( xItem, css::uno::UNO_QUERY_THROW); - css::uno::Sequence< css::uno::Any > aValues; - aValues = xPropSet->getPropertyValues(rNames); + css::uno::Sequence< css::uno::Any > aValues = xPropSet->getPropertyValues(rNames); for (sal_Int32 i = 0; i < aValues.getLength(); i++) aItem[rNames[i]] = aValues[i]; @@ -1600,8 +1598,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: { css::uno::Reference< css::beans::XMultiPropertySet > xPropSet( xItem, css::uno::UNO_QUERY_THROW); - css::uno::Sequence< css::uno::Any > aValues; - aValues = xPropSet->getPropertyValues(rNames); + css::uno::Sequence< css::uno::Any > aValues = xPropSet->getPropertyValues(rNames); for (sal_Int32 i = 0; i < rNames.getLength(); i++) { diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx index d7e6b61fd7a8..74895eb4251f 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx @@ -224,8 +224,7 @@ void DXF2GDIMetaFile::DrawLineEntity(const DXFLineEntity & rE, const DXFTransfor rTransform.Transform(rE.aP0,aP0); rTransform.Transform(rE.aP1,aP1); - DXFLineInfo aDXFLineInfo; - aDXFLineInfo=GetEntityDXFLineInfo(rE); + DXFLineInfo aDXFLineInfo=GetEntityDXFLineInfo(rE); LineInfo aLineInfo; aLineInfo = rTransform.Transform(aDXFLineInfo); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 7ee80504a317..971655d18b5e 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -198,8 +198,7 @@ void Impl_OlePres::Write( SvStream & rStm ) if( MapUnit::Map100thMM != nMU ) { Size aPrefS( pMtf->GetPrefSize() ); - Size aS( aPrefS ); - aS = OutputDevice::LogicToLogic(aS, MapMode(nMU), MapMode(MapUnit::Map100thMM)); + Size aS = OutputDevice::LogicToLogic(aPrefS, MapMode(nMU), MapMode(MapUnit::Map100thMM)); pMtf->Scale( Fraction( aS.Width(), aPrefS.Width() ), Fraction( aS.Height(), aPrefS.Height() ) ); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 7b4e365cfd69..770138117f05 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2441,8 +2441,7 @@ bool SdrPowerPointImport::SeekToCurrentPage( DffRecordHeader* pRecHd ) const sal_uLong nPersist = (*pList)[ nCurrentPageNum ].aPersistAtom.nPsrReference; if ( nPersist > 0 && nPersist < nPersistPtrCnt ) { - sal_uLong nFPos = 0; - nFPos = pPersistPtr[ nPersist ]; + sal_uLong nFPos = pPersistPtr[ nPersist ]; if ( nFPos < nStreamLen ) { rStCtrl.Seek( nFPos ); diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index d5cb95f732ef..46e8ce4cd1d4 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -1296,8 +1296,7 @@ void SVGFilter::implExportAnimations() mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "Animations" ); SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true ); - rtl::Reference< xmloff::AnimationsExporter > xAnimationsExporter; - xAnimationsExporter = new xmloff::AnimationsExporter( *mpSVGExport, xProps ); + rtl::Reference< xmloff::AnimationsExporter > xAnimationsExporter = new xmloff::AnimationsExporter( *mpSVGExport, xProps ); xAnimationsExporter->prepare( xRootNode ); xAnimationsExporter->exportAnimations( xRootNode ); } diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index b6aeebe59ba0..0534361dd9ad 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -169,9 +169,7 @@ OUString T602ImportFilter::detect( Sequence<PropertyValue>& Descriptor) css::uno::Sequence< sal_Int8 > aData; const size_t numBytes = 4; - size_t numBytesRead = 0; - - numBytesRead = mxInputStream->readSomeBytes (aData, numBytes); + size_t numBytesRead = mxInputStream->readSomeBytes (aData, numBytes); if ((numBytesRead != numBytes) || (aData[0] != '@') || (aData[1] != 'C') || (aData[2] != 'T') || (aData[3] != ' ')) diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index 8bd97ca2823b..ca879c93a4fa 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -102,8 +102,7 @@ void XMLFilterTabPageXSLT::SetURL( URLBox& rURLBox, const OUString& rURL ) } else if( !rURL.isEmpty() ) { - OUString aURL( rURL ); - aURL = URIHelper::SmartRel2Abs( INetURLObject(sInstPath), aURL, Link<OUString *, bool>(), false ); + OUString aURL = URIHelper::SmartRel2Abs( INetURLObject(sInstPath), rURL, Link<OUString *, bool>(), false ); osl::FileBase::getSystemPathFromFileURL( aURL, aPath ); rURLBox.SetBaseURL( aURL ); |