diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-04 20:17:29 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-05 13:27:46 +0100 |
commit | 6d1aafca5d13fa08371a3ff161d12c0f1213555c (patch) | |
tree | 393a583cc919b9d2af7a0849fc151629321466f4 /filter | |
parent | e07253e0262a11dc96a98598c55c43da16b9678a (diff) |
tdf#120703 PVS: V547 Expression is always true/false
Change-Id: If748a205b328a23473152872c6d0ed87d0570cc1
Reviewed-on: https://gerrit.libreoffice.org/62857
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/msfilter/msvbahelper.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 90c23a0797b3..8e7cfec8267c 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -482,20 +482,16 @@ bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, uno::Sequ uno::Sequence< uno::Any > aOutArgs; try - { ErrCode nErr( ERRCODE_BASIC_INTERNAL_ERROR ); - if ( pShell ) + { + ErrCode nErr = pShell->CallXScript(sUrl, aArgs, aRet, aOutArgsIndex, aOutArgs, false); + sal_Int32 nLen = aOutArgs.getLength(); + // convert any out params to seem like they were inputs + if (nLen) { - nErr = pShell->CallXScript( sUrl, - aArgs, aRet, aOutArgsIndex, aOutArgs, false ); - sal_Int32 nLen = aOutArgs.getLength(); - // convert any out params to seem like they were inputs - if ( nLen ) + for (sal_Int32 index = 0; index < nLen; ++index) { - for ( sal_Int32 index=0; index < nLen; ++index ) - { - sal_Int32 nOutIndex = aOutArgsIndex[ index ]; - aArgs[ nOutIndex ] = aOutArgs[ index ]; - } + sal_Int32 nOutIndex = aOutArgsIndex[index]; + aArgs[nOutIndex] = aOutArgs[index]; } } bRes = ( nErr == ERRCODE_NONE ); |