diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-02 18:59:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-03 17:11:14 +0100 |
| commit | ab285c743afa1c8769581871d7b56374fd8c49f1 (patch) | |
| tree | d5628df49fb4db29d474e5e7b7cef4072c33153a /formula | |
| parent | f4544f3903fed3a656e3cd57e1bd83582e024b96 (diff) | |
loplugin:stringadd
tweak the plugin to be more permissive, then validate by hand
afterwards
Change-Id: I40c5c911fe6ff7e45baaca372abf7dac211d9654
Reviewed-on: https://gerrit.libreoffice.org/81942
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/ui/dlg/funcutl.cxx | 6 | ||||
| -rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index b2d018befbd2..21ab45c0ee6b 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -233,12 +233,10 @@ void ArgInput::UpdateAccessibleNames() { OUString aArgName = ":" + pFtArg->get_label(); - OUString aName = pBtnFx->get_tooltip_text(); - aName += aArgName; + OUString aName = pBtnFx->get_tooltip_text() + aArgName; pBtnFx->set_accessible_name(aName); - aName = pRefBtn->GetWidget()->get_tooltip_text(); - aName += aArgName; + aName = pRefBtn->GetWidget()->get_tooltip_text() + aArgName; pRefBtn->GetWidget()->set_accessible_name(aName); } diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index c4f6a8f1fdc2..9d8f1be6e0b2 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -119,8 +119,8 @@ void ParaWin::UpdateArgDesc( sal_uInt16 nArg ) { sal_uInt16 nRealArg = (nArg < aVisibleArgMapping.size()) ? aVisibleArgMapping[nArg] : nArg; aArgDesc = pFuncDesc->getParameterDescription(nRealArg); - aArgName = pFuncDesc->getParameterName(nRealArg) + " "; - aArgName += (pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired ; + aArgName = pFuncDesc->getParameterName(nRealArg) + " " + + ((pFuncDesc->isParameterOptional(nRealArg)) ? m_sOptional : m_sRequired); } else if ( nArgs < PAIRED_VAR_ARGS ) { @@ -183,8 +183,8 @@ void ParaWin::UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i ) sal_uInt16 nVarArgsStart = pFuncDesc->getVarArgsStart(); if ( nArg >= nVarArgsStart ) { - OUString aArgName( pFuncDesc->getParameterName(nRealArg) ); - aArgName += OUString::number(nArg-nVarArgsStart+1); + OUString aArgName = pFuncDesc->getParameterName(nRealArg) + + OUString::number(nArg-nVarArgsStart+1); SetArgName( i, aArgName ); } else @@ -206,8 +206,8 @@ void ParaWin::UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i ) sal_uInt16 nVarArgsStart = pFuncDesc->getVarArgsStart(); if ( nArg >= nVarArgsStart ) { - OUString aArgName( pFuncDesc->getParameterName(nRealArg) ); - aArgName += OUString::number( (nArg-nVarArgsStart)/2 + 1 ); + OUString aArgName = pFuncDesc->getParameterName(nRealArg) + + OUString::number( (nArg-nVarArgsStart)/2 + 1 ); SetArgName( i, aArgName ); } else |