diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-14 16:39:53 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-04-15 08:37:21 +0200 |
commit | 7facde27194b866e589eada3f5657b0b5c69efb0 (patch) | |
tree | 73c66b4faf608a3ade0058ef2f72c5a49de44aaf /toolkit | |
parent | 9f392d0c09bd946e4660ccc2d48ee3ae1367343c (diff) |
loplugin:sequentialassign in test..tools
Change-Id: I3a6c5807c3262dde6756551e9e955c4ceae09b4f
Reviewed-on: https://gerrit.libreoffice.org/70732
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
-rw-r--r-- | toolkit/source/awt/vclxaccessiblecomponent.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/awt/vclxprinter.cxx | 6 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/geometrycontrolmodel.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 3 |
6 files changed, 7 insertions, 14 deletions
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 6f768ac2cbd9..8bd78e5d9c1b 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -533,9 +533,8 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi { OExternalLockGuard aGuard( this ); - uno::Reference< accessibility::XAccessible > xAcc; // we do _not_ have a foreign-controlled parent -> default to our VCL parent - xAcc = getVclParent(); + uno::Reference< accessibility::XAccessible > xAcc = getVclParent(); return xAcc; } diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 912e721b6eda..6d78cdce558c 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -343,15 +343,13 @@ css::uno::Sequence< OUString > VCLXPrinterServer::getPrinterNames( ) css::uno::Reference< css::awt::XPrinter > VCLXPrinterServer::createPrinter( const OUString& rPrinterName ) { - css::uno::Reference< css::awt::XPrinter > xP; - xP = new VCLXPrinter( rPrinterName ); + css::uno::Reference< css::awt::XPrinter > xP = new VCLXPrinter( rPrinterName ); return xP; } css::uno::Reference< css::awt::XInfoPrinter > VCLXPrinterServer::createInfoPrinter( const OUString& rPrinterName ) { - css::uno::Reference< css::awt::XInfoPrinter > xP; - xP = new VCLXInfoPrinter( rPrinterName ); + css::uno::Reference< css::awt::XInfoPrinter > xP = new VCLXInfoPrinter( rPrinterName ); return xP; } diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index f0e000146e1f..8750d90beb0f 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -1079,8 +1079,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor& rDescriptor, vcl::Window* pParent, WinBits nWinBits, MessBoxStyle nMessBoxStyle ) { - OUString aServiceName( rDescriptor.WindowServiceName ); - aServiceName = aServiceName.toAsciiLowerCase(); + OUString aServiceName = rDescriptor.WindowServiceName.toAsciiLowerCase(); VclPtr<vcl::Window> pNewWindow; WindowType nType = ImplGetComponentType( aServiceName ); diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index e163b832c3d1..cb8b45afda8d 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -1054,8 +1054,7 @@ void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl ) if ( pOutDev ) { // Adjust Y based on height of Title - ::tools::Rectangle aRect; - aRect = pOutDev->GetTextRect( aRect, sTitle ); + ::tools::Rectangle aRect = pOutDev->GetTextRect( aRect, sTitle ); nY = nY + ( aRect.GetHeight() / 2 ); } else diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index fedcd4dc1d29..5d183f09aa41 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -524,8 +524,7 @@ OPropertyContainer::describeProperties( aProps ); // the aggregate properties - Sequence< Property > aAggregateProps; - aAggregateProps = AggregateProperties::get()[ _nId ]; + Sequence< Property > aAggregateProps = AggregateProperties::get()[ _nId ]; // look for duplicates, and remember them IntArrayArray::value_type& rDuplicateIds = AmbiguousPropertyIds::get()[ _nId ]; diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 37b185438867..b2ac375acba8 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -1262,8 +1262,7 @@ void UnoControlModel::setFastPropertyValue( sal_Int32 nPropId, const css::uno::A Any aNewValue; aNewValue <<= aNewFontDescriptor; - sal_Int32 nDescriptorId( BASEPROPERTY_FONTDESCRIPTOR ); - nDescriptorId = BASEPROPERTY_FONTDESCRIPTOR; + sal_Int32 nDescriptorId = BASEPROPERTY_FONTDESCRIPTOR; // also, we need fire a propertyChange event for the single property, since with // the above line, only an event for the FontDescriptor property will be fired |