summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-08-06 13:32:43 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-08-14 18:03:06 +0200
commite67657d5211f6e95ddf8bd621108608573b00d5d (patch)
tree66724101dbd95721714bd40fcb4861663432774c /reportdesign
parent186def8f48e273c3a3b4d23b3ab2efd0d8664731 (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 'reportdesign')
-rw-r--r--reportdesign/source/core/sdr/UndoActions.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlControlProperty.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 84161e92bcb1..02585c420eaa 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -112,7 +112,7 @@ OUndoContainerAction::~OUndoContainerAction()
// and the object does not have a parent
Reference< XChild > xChild( m_xOwnElement, UNO_QUERY );
- if ( !(xChild.is() && !xChild->getParent().is()) )
+ if ( !xChild.is() || xChild->getParent().is() )
return;
OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv();
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 4d69f5dff943..8af7508269aa 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -138,7 +138,7 @@ void OXMLControlProperty::endFastElement(sal_Int32 )
{
if ( m_pContainer )
m_pContainer->addValue(m_aCharBuffer.makeStringAndClear());
- if ( !(!m_aSetting.Name.isEmpty() && m_xControl.is()) )
+ if ( m_aSetting.Name.isEmpty() || !m_xControl.is() )
return;
if ( m_bIsList && !m_aSequence.hasElements() )