diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-13 21:28:19 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-14 08:29:15 +0200 |
commit | 42204a80aa7d4ce778596fa6ccab7d144c04e9b1 (patch) | |
tree | f3e4b15abc5ad6f53781436bc307ac19e6785e12 /svtools | |
parent | 8f59317223e0b8e1e5e6e4145b6ee457fe9e15f3 (diff) |
loplugin:sequentialassign in svtools..svx
Change-Id: I465a2479f347303e6d4faa39cb0a0f05aec3bf07
Reviewed-on: https://gerrit.libreoffice.org/70719
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/contnr/contentenumeration.cxx | 3 | ||||
-rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 3 | ||||
-rw-r--r-- | svtools/source/control/inettbc.cxx | 16 | ||||
-rw-r--r-- | svtools/source/control/ruler.cxx | 3 | ||||
-rw-r--r-- | svtools/source/control/tabbar.cxx | 3 | ||||
-rw-r--r-- | svtools/source/filter/SvFilterOptionsDialog.cxx | 3 | ||||
-rw-r--r-- | svtools/source/misc/embedtransfer.cxx | 3 | ||||
-rw-r--r-- | svtools/source/uno/unoiface.cxx | 3 |
8 files changed, 12 insertions, 25 deletions
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index 106181eef50b..c3fff23b4a2f 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -174,8 +174,7 @@ namespace svt } } - Reference< XDynamicResultSet > xDynResultSet; - xDynResultSet = aFolder.aContent.createDynamicCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ); + Reference< XDynamicResultSet > xDynResultSet = aFolder.aContent.createDynamicCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ); if ( xDynResultSet.is() ) xResultSet = xDynResultSet->getStaticResultSet(); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index ad9a4dd035f1..a27e6ad64d6f 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -1678,8 +1678,7 @@ tools::Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* p if( pEntryPos ) aBound.SetPos( *pEntryPos ); - tools::Rectangle aTextRect( aMaxTextRect ); - aTextRect = pView->GetTextRect( aTextRect, aEntryText, nCurTextDrawFlags ); + tools::Rectangle aTextRect = pView->GetTextRect( aMaxTextRect, aEntryText, nCurTextDrawFlags ); Size aTextSize( aTextRect.GetSize() ); diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 9058d44f0826..79442ac9d18e 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -408,8 +408,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL, pInfo[ 1 ].ColumnIndex = 1; pInfo[ 1 ].Ascending = true; - uno::Reference< XDynamicResultSet > xDynamicResultSet; - xDynamicResultSet = + uno::Reference< XDynamicResultSet > xDynamicResultSet = xSRSFac->createSortedDynamicResultSet( xDynResultSet, aSortInfo, xCompare ); if ( xDynamicResultSet.is() ) @@ -699,9 +698,7 @@ void MatchContext_Impl::ReadFolder( const OUString& rURL, try { - uno::Reference< XDynamicResultSet > xDynResultSet; - - xDynResultSet = aCnt.createDynamicCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ); + uno::Reference< XDynamicResultSet > xDynResultSet = aCnt.createDynamicCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ); uno::Reference < XAnyCompareFactory > xCompare; uno::Reference < XSortedDynamicResultSetFactory > xSRSFac = @@ -714,8 +711,7 @@ void MatchContext_Impl::ReadFolder( const OUString& rURL, pInfo[ 1 ].ColumnIndex = 1; pInfo[ 1 ].Ascending = true; - uno::Reference< XDynamicResultSet > xDynamicResultSet; - xDynamicResultSet = + uno::Reference< XDynamicResultSet > xDynamicResultSet = xSRSFac->createSortedDynamicResultSet( xDynResultSet, aSortInfo, xCompare ); if ( xDynamicResultSet.is() ) @@ -1530,8 +1526,7 @@ void SvtURLBox::UpdatePicklistForSmartProtocol_Impl() bool bFound = aURL.endsWith("/"); if ( !bFound ) { - OUString aUpperURL( aURL ); - aUpperURL = aUpperURL.toAsciiUpperCase(); + OUString aUpperURL = aURL.toAsciiUpperCase(); bFound = ::std::any_of(pImpl->m_aFilters.begin(), pImpl->m_aFilters.end(), @@ -2104,8 +2099,7 @@ void URLBox::UpdatePicklistForSmartProtocol_Impl() bool bFound = aURL.endsWith("/"); if ( !bFound ) { - OUString aUpperURL( aURL ); - aUpperURL = aUpperURL.toAsciiUpperCase(); + OUString aUpperURL = aURL.toAsciiUpperCase(); bFound = ::std::any_of(pImpl->m_aFilters.begin(), pImpl->m_aFilters.end(), diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 0792cd61bf7a..8e39fe9beb8b 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -1852,8 +1852,7 @@ void Ruler::ImplDrag( const Point& rPos ) { // reset the data mbDragCanceled = true; - ImplRulerData aTempData; - aTempData = *mpDragData; + ImplRulerData aTempData = *mpDragData; *mpDragData = *mpSaveData; mbCalc = true; mbFormat = true; diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index f183954abf3c..fdc313415dd6 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -609,8 +609,7 @@ void TabBar::ImplInitSettings( bool bFont, bool bBackground ) if (bFont) { - vcl::Font aToolFont; - aToolFont = rStyleSettings.GetToolFont(); + vcl::Font aToolFont = rStyleSettings.GetToolFont(); aToolFont.SetWeight( WEIGHT_BOLD ); ApplyControlFont(*this, aToolFont); diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index 2145603892cb..fb630a824b12 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -210,8 +210,7 @@ sal_Int16 SvFilterOptionsDialog::execute() { OUString aStr; maMediaDescriptor[ j ].Value >>= aStr; - aInternalFilterName = aStr; - aInternalFilterName = aInternalFilterName.replaceFirst( "draw_", "" ); + aInternalFilterName = aStr.replaceFirst( "draw_", "" ); aInternalFilterName = aInternalFilterName.replaceFirst( "impress_", "" ); aInternalFilterName = aInternalFilterName.replaceFirst( "calc_", "" ); aInternalFilterName = aInternalFilterName.replaceFirst( "writer_", "" ); diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index 02cd9fe547ff..cf242c0efbe5 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -230,8 +230,7 @@ void SvEmbedTransferHelper::FillTransferableObjectDescriptor( TransferableObject { try { - awt::Size aSz; - aSz = xObj->getVisualAreaSize( rDesc.mnViewAspect ); + awt::Size aSz = xObj->getVisualAreaSize( rDesc.mnViewAspect ); aSize = Size( aSz.Width, aSz.Height ); } catch( embed::NoVisualAreaSizeException& ) diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 46a53d2c0fc1..00a8df04ed9d 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -1442,8 +1442,7 @@ void SVTXRoadmap::propertyChange( const css::beans::PropertyChangeEvent& evt ) if ( !pField ) return; - css::uno::Reference< css::uno::XInterface > xRoadmapItem; - xRoadmapItem = evt.Source; + css::uno::Reference< css::uno::XInterface > xRoadmapItem = evt.Source; sal_Int32 nID = 0; css::uno::Reference< css::beans::XPropertySet > xPropertySet( xRoadmapItem, css::uno::UNO_QUERY ); css::uno::Any aValue = xPropertySet->getPropertyValue("ID"); |