diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-06 13:32:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-14 18:03:06 +0200 |
| commit | e67657d5211f6e95ddf8bd621108608573b00d5d (patch) | |
| tree | 66724101dbd95721714bd40fcb4861663432774c /vbahelper | |
| parent | 186def8f48e273c3a3b4d23b3ab2efd0d8664731 (diff) | |
loplugin:simplifybool more
look for expressions like
!(a && !b)
which can be expanded out
Change-Id: I72515a9638762b050f9a258c08da39ebfa2ef8e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100579
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vbahelper')
| -rw-r--r-- | vbahelper/source/msforms/vbacontrols.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index 56a0b80aebe2..7c56bd2bbff4 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -435,8 +435,17 @@ void SAL_CALL ScVbaControls::Remove( const uno::Any& StringKeyOrIndex ) uno::Reference< lang::XMultiServiceFactory > xModelFactory( mxDialog->getModel(), uno::UNO_QUERY_THROW ); uno::Reference< container::XNameContainer > xDialogContainer( xModelFactory, uno::UNO_QUERY_THROW ); - if ( !( ( StringKeyOrIndex >>= aControlName ) && !aControlName.isEmpty() ) - && !( ( StringKeyOrIndex >>= nIndex ) && nIndex >= 0 && nIndex < m_xIndexAccess->getCount() ) ) + if ( StringKeyOrIndex >>= aControlName ) + { + if ( aControlName.isEmpty() ) + throw uno::RuntimeException(); + } + else if ( StringKeyOrIndex >>= nIndex ) + { + if (nIndex >= 0 && nIndex < m_xIndexAccess->getCount() ) + throw uno::RuntimeException(); + } + else throw uno::RuntimeException(); uno::Reference< awt::XControl > xControl; |