From 04112bce506c60254cb1cb8536f942c8adb5c7d6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 13 Apr 2019 08:22:37 +0200 Subject: loplugin:sequentialassign in filter..fpicker Change-Id: I4ba0e1e982897bd570612f6cda8ba1e6a9fa5dbd Reviewed-on: https://gerrit.libreoffice.org/70700 Tested-by: Jenkins Reviewed-by: Noel Grandin --- forms/source/component/EventThread.cxx | 4 +--- forms/source/component/Filter.cxx | 3 +-- forms/source/xforms/resourcehelper.cxx | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'forms') diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx index 84b9b4798b83..357888111991 100644 --- a/forms/source/component/EventThread.cxx +++ b/forms/source/component/EventThread.cxx @@ -57,9 +57,7 @@ OComponentEventThread::~OComponentEventThread() Any SAL_CALL OComponentEventThread::queryInterface(const Type& _rType) { - Any aReturn; - - aReturn = OWeakObject::queryInterface(_rType); + Any aReturn = OWeakObject::queryInterface(_rType); if (!aReturn.hasValue()) aReturn = ::cppu::queryInterface(_rType, diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index fb56cbdd3c8a..ccaa7f209687 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -519,8 +519,7 @@ namespace frm if ( m_aText != aText ) { // check the text with the SQL-Parser - OUString aNewText(aText); - aNewText = aNewText.trim(); + OUString aNewText = aText.trim(); if ( !aNewText.isEmpty() ) { ::dbtools::OPredicateInputController aPredicateInput( m_xContext, m_xConnection, getParseContext() ); diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx index 0e3cbdf00b66..371b707f8c85 100644 --- a/forms/source/xforms/resourcehelper.cxx +++ b/forms/source/xforms/resourcehelper.cxx @@ -54,8 +54,7 @@ OUString getResource(const char* pResourceId, OUString sResource = frm::ResourceManager::loadString(pResourceId); OSL_ENSURE( !sResource.isEmpty(), "resource not found?" ); - OUString sString( sResource ); - sString = sString.replaceAll( "$1", rInfo1 ); + OUString sString = sResource.replaceAll( "$1", rInfo1 ); sString = sString.replaceAll( "$2", rInfo2 ); sString = sString.replaceAll( "$3", rInfo3 ); return sString; -- cgit